From cbfe9eaa4552d7e8a759fd438e71ec003fc02fc8 Mon Sep 17 00:00:00 2001 From: Song Guo Date: Tue, 15 Mar 2022 11:22:19 +0800 Subject: [PATCH 1/6] [spec] Update field ids of existing FabricIndex fields to 0xFE --- .../data-model/chip/access-control-cluster.xml | 4 ++-- .../zcl/data-model/chip/binding-cluster.xml | 10 +++++----- .../data-model/chip/group-key-mgmt-cluster.xml | 4 ++-- .../chip/operational-credentials-cluster.xml | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index 5630d4efeffbcb..66dfdbaddbacee 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -49,17 +49,17 @@ limitations under the License. - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index ede4f797947dec..f7cecaf94bf083 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -19,11 +19,11 @@ limitations under the License. - - - - - + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 41c338211a42d5..8299bb12894564 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -19,17 +19,17 @@ limitations under the License. - + - + diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index df8b57f1d53c03..b61590f299b1d9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -19,12 +19,12 @@ limitations under the License. - - - - - - + + + + + + @@ -43,9 +43,9 @@ limitations under the License. - - - + + + From 4443dd6172370358d802f237f313044cd400b01d Mon Sep 17 00:00:00 2001 From: Song Guo Date: Tue, 15 Mar 2022 11:48:30 +0800 Subject: [PATCH 2/6] Run Codegen --- .../all-clusters-app.matter | 14 +- .../bridge-common/bridge-app.matter | 12 +- .../door-lock-common/door-lock-app.matter | 8 +- .../light-switch-app.matter | 14 +- .../lighting-common/lighting-app.matter | 12 +- examples/lock-app/lock-common/lock-app.matter | 8 +- .../log-source-common/log-source-app.matter | 6 +- .../ota-provider-app.matter | 12 +- .../ota-requestor-app.matter | 8 +- .../placeholder/linux/apps/app1/config.matter | 4 +- .../placeholder/linux/apps/app2/config.matter | 4 +- examples/pump-app/pump-common/pump-app.matter | 12 +- .../pump-controller-app.matter | 12 +- .../esp32/main/temperature-measurement.matter | 8 +- .../thermostat-common/thermostat.matter | 14 +- examples/tv-app/tv-common/tv-app.matter | 20 +- .../tv-casting-common/tv-casting-app.matter | 14 +- examples/window-app/common/window-app.matter | 8 +- .../data_model/controller-clusters.matter | 14 +- .../CHIPAttributeTLVValueDecoder.cpp | 125 +++++------ .../zap-generated/CHIPClustersWrite-JNI.cpp | 46 ++-- .../java/zap-generated/CHIPReadCallbacks.cpp | 122 +++++----- .../chip/devicecontroller/ChipStructs.java | 92 ++++---- .../python/chip/clusters/Objects.py | 28 +-- .../CHIPAttributeTLVValueDecoder.mm | 14 +- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 14 +- .../CHIP/zap-generated/CHIPClustersObjc.mm | 8 +- .../CHIP/zap-generated/CHIPStructsObjc.h | 14 +- .../CHIP/zap-generated/CHIPStructsObjc.mm | 28 +-- .../zap-generated/CHIPTestClustersObjc.mm | 6 +- .../Framework/CHIPTests/CHIPClustersTests.m | 130 +++++------ .../app-common/zap-generated/af-structs.h | 14 +- .../zap-generated/cluster-objects.cpp | 86 ++++---- .../zap-generated/cluster-objects.h | 44 ++-- .../cluster/CHIPTestClustersObjc.mm | 6 +- .../zap-generated/test/Commands.h | 132 +++++------ .../cluster/ComplexArgumentParser.cpp | 78 +++---- .../cluster/logging/DataModelLogger.cpp | 96 ++++---- .../chip-tool/zap-generated/test/Commands.h | 208 +++++++++--------- 39 files changed, 748 insertions(+), 747 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 index d39ad6fc0abb11..d5c7d7c318b73b 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -230,11 +230,11 @@ server cluster BinaryInputBasic = 15 { server cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -1462,16 +1462,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -2312,18 +2312,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 312e99cd554b5b..9d2f03cbdc5076 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -28,11 +28,11 @@ client cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ client cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -90,11 +90,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -104,8 +104,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -692,18 +692,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter index cd3a9880e1b3cb..1ac8a6354e22e2 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.matter +++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -1051,18 +1051,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 6dfb199c86a493..af5a7358f7f587 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -142,11 +142,11 @@ server cluster Basic = 40 { server cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -615,16 +615,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -1121,18 +1121,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 2f7b48080c2e60..dacb8827dbfc18 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -628,16 +628,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -1212,18 +1212,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 209fd9de61d73d..9ef451290e6994 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -684,18 +684,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 330f5efdd38344..2bffbbb90b7f56 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -23,11 +23,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -37,8 +37,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -304,12 +304,12 @@ server cluster OperationalCredentials = 62 { } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute FabricDescriptor fabrics[] = 1; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 1aaab805e740e9..f4101f7659cb48 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -28,11 +28,11 @@ client cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ client cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -90,11 +90,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -104,8 +104,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -442,18 +442,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index d66db472b19f94..9cf211042deb55 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -484,18 +484,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 9b8ea2a04e399c..50edd770cf023d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1251,12 +1251,12 @@ client cluster OperationalCredentials = 62 { } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute FabricDescriptor fabrics[] = 1; @@ -1333,12 +1333,12 @@ server cluster OperationalCredentials = 62 { } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute FabricDescriptor fabrics[] = 1; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index e39670fda270d1..05aa5808d5dde1 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1188,12 +1188,12 @@ client cluster OperationalCredentials = 62 { } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute FabricDescriptor fabrics[] = 1; @@ -1270,12 +1270,12 @@ server cluster OperationalCredentials = 62 { } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute FabricDescriptor fabrics[] = 1; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index efb7faa268a6e9..ded9177e08b4b4 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -369,16 +369,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -939,18 +939,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 5e93a038dcae22..fc4b7c55e07ae7 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -366,16 +366,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -829,18 +829,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 8f6a97fdf9993c..94b5da4216cd63 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -505,18 +505,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 21e61114ca0084..00acb200b95451 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -142,11 +142,11 @@ server cluster Basic = 40 { server cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -385,16 +385,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } attribute GroupKeyMapStruct groupKeyMap[] = 0; @@ -746,18 +746,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index b5af48262dbb83..97d16520054e40 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -272,11 +272,11 @@ server cluster Basic = 40 { client cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -285,11 +285,11 @@ client cluster Binding = 30 { server cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -745,16 +745,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } attribute GroupKeyMapStruct groupKeyMap[] = 0; @@ -1441,18 +1441,18 @@ client cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; @@ -1539,18 +1539,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; 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 index 9dc39d2c85a8b0..19e7f22ea24cb6 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -271,11 +271,11 @@ server cluster BinaryInputBasic = 15 { server cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -1399,16 +1399,16 @@ server cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } attribute GroupKeyMapStruct groupKeyMap[] = 0; @@ -2240,18 +2240,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 25a387ec364270..bac22903dd89ed 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -28,11 +28,11 @@ server cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ server cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -526,18 +526,18 @@ server cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 0ba1b9da8ad16f..517a7840b7765e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -28,11 +28,11 @@ client cluster AccessControl = 31 { } struct AccessControlEntry { - fabric_idx fabricIndex = 0; Privilege privilege = 1; AuthMode authMode = 2; nullable INT64U subjects[] = 3; nullable Target targets[] = 4; + fabric_idx fabricIndex = 254; } struct Target { @@ -42,8 +42,8 @@ client cluster AccessControl = 31 { } struct ExtensionEntry { - fabric_idx fabricIndex = 0; OCTET_STRING<254> data = 1; + fabric_idx fabricIndex = 254; } info event AccessControlEntryChanged = 0 { @@ -320,11 +320,11 @@ client cluster BinaryInputBasic = 15 { client cluster Binding = 30 { struct TargetStruct { - FABRIC_IDX fabricIndex = 0; optional NODE_ID node = 1; optional GROUP_ID group = 2; optional ENDPOINT_NO endpoint = 3; optional CLUSTER_ID cluster = 4; + FABRIC_IDX fabricIndex = 254; } attribute TargetStruct binding[] = 0; @@ -1836,16 +1836,16 @@ client cluster GroupKeyManagement = 63 { } struct GroupKeyMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; INT16U groupKeySetID = 2; + fabric_idx fabricIndex = 254; } struct GroupInfoMapStruct { - fabric_idx fabricIndex = 0; group_id groupId = 1; endpoint_no endpoints[] = 2; optional CHAR_STRING<16> groupName = 3; + fabric_idx fabricIndex = 254; } struct GroupKeySetStruct { @@ -2734,18 +2734,18 @@ client cluster OperationalCredentials = 62 { } struct NOCStruct { - fabric_idx fabricIndex = 0; OCTET_STRING noc = 1; nullable OCTET_STRING icac = 2; + fabric_idx fabricIndex = 254; } struct FabricDescriptor { - fabric_idx fabricIndex = 0; OCTET_STRING<65> rootPublicKey = 1; INT16U vendorId = 2; FABRIC_ID fabricId = 3; NODE_ID nodeId = 4; CHAR_STRING<32> label = 5; + fabric_idx fabricIndex = 254; } readonly attribute NOCStruct NOCs[] = 0; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 0f1188b2e1d185..dd77641b7f4e29 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -57,12 +57,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_privilege; std::string newElement_0_privilegeClassName = "java/lang/Integer"; std::string newElement_0_privilegeCtorSignature = "(I)V"; @@ -171,6 +165,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_NaN); } } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass accessControlEntryStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -182,7 +182,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID accessControlEntryStructCtor = env->GetMethodID( accessControlEntryStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"); + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); if (accessControlEntryStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor"); @@ -190,8 +190,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } newElement_0 = - env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_fabricIndex, - newElement_0_privilege, newElement_0_authMode, newElement_0_subjects, newElement_0_targets); + env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege, + newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -212,17 +212,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; + jobject newElement_0_data; + jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast(entry_0.data.size())); + env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast(entry_0.data.size()), + reinterpret_cast(entry_0.data.data())); + newElement_0_data = newElement_0_dataByteArray; jobject newElement_0_fabricIndex; std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; std::string newElement_0_fabricIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), newElement_0_fabricIndexCtorSignature.c_str(), entry_0.fabricIndex, newElement_0_fabricIndex); - jobject newElement_0_data; - jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast(entry_0.data.size())); - env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast(entry_0.data.size()), - reinterpret_cast(entry_0.data.data())); - newElement_0_data = newElement_0_dataByteArray; jclass extensionEntryStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -233,15 +233,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } jmethodID extensionEntryStructCtor = - env->GetMethodID(extensionEntryStructClass, "", "(Ljava/lang/Integer;[B)V"); + env->GetMethodID(extensionEntryStructClass, "", "([BLjava/lang/Integer;)V"); if (extensionEntryStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor"); return nullptr; } - newElement_0 = env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_fabricIndex, - newElement_0_data); + newElement_0 = env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data, + newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -1853,12 +1853,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_node; if (!entry_0.node.HasValue()) { @@ -1921,6 +1915,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_0_clusterInsideOptional); chip::JniReferences::GetInstance().CreateOptional(newElement_0_clusterInsideOptional, newElement_0_cluster); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass targetStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -1932,15 +1932,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID targetStructStructCtor = env->GetMethodID( targetStructStructClass, "", - "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"); + "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V"); if (targetStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$BindingClusterTargetStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(targetStructStructClass, targetStructStructCtor, newElement_0_fabricIndex, - newElement_0_node, newElement_0_group, newElement_0_endpoint, newElement_0_cluster); + newElement_0 = + env->NewObject(targetStructStructClass, targetStructStructCtor, newElement_0_node, newElement_0_group, + newElement_0_endpoint, newElement_0_cluster, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -6311,12 +6312,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_groupId; std::string newElement_0_groupIdClassName = "java/lang/Integer"; std::string newElement_0_groupIdCtorSignature = "(I)V"; @@ -6329,6 +6324,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_groupKeySetIDClassName.c_str(), newElement_0_groupKeySetIDCtorSignature.c_str(), entry_0.groupKeySetID, newElement_0_groupKeySetID); + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass groupKeyMapStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -6347,8 +6348,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_fabricIndex, - newElement_0_groupId, newElement_0_groupKeySetID); + newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId, + newElement_0_groupKeySetID, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -6369,12 +6370,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_groupId; std::string newElement_0_groupIdClassName = "java/lang/Integer"; std::string newElement_0_groupIdCtorSignature = "(I)V"; @@ -6407,6 +6402,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str()); chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass groupInfoMapStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -6419,15 +6420,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID groupInfoMapStructStructCtor = env->GetMethodID(groupInfoMapStructStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;)V"); + "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V"); if (groupInfoMapStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_fabricIndex, - newElement_0_groupId, newElement_0_endpoints, newElement_0_groupName); + newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId, + newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -9243,12 +9244,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_noc; jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast(entry_0.noc.size())); env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast(entry_0.noc.size()), @@ -9266,6 +9261,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR reinterpret_cast(entry_0.icac.Value().data())); newElement_0_icac = newElement_0_icacByteArray; } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass NOCStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -9275,15 +9276,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct"); return nullptr; } - jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "", "(Ljava/lang/Integer;[B[B)V"); + jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "", "([B[BLjava/lang/Integer;)V"); if (NOCStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor"); return nullptr; } - newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_fabricIndex, newElement_0_noc, - newElement_0_icac); + newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac, + newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -9304,12 +9305,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_rootPublicKey; jbyteArray newElement_0_rootPublicKeyByteArray = env->NewByteArray(static_cast(entry_0.rootPublicKey.size())); @@ -9336,6 +9331,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR entry_0.nodeId, newElement_0_nodeId); jobject newElement_0_label; newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str()); + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass fabricDescriptorStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -9348,16 +9349,16 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID fabricDescriptorStructCtor = env->GetMethodID( fabricDescriptorStructClass, "", - "(Ljava/lang/Integer;[BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;)V"); + "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V"); if (fabricDescriptorStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor"); return nullptr; } - newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_fabricIndex, - newElement_0_rootPublicKey, newElement_0_vendorId, newElement_0_fabricId, - newElement_0_nodeId, newElement_0_label); + newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey, + newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label, + newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 122e4bfb436a54..6bf8f692fc7e02 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -67,12 +67,6 @@ JNI_METHOD(void, AccessControlCluster, writeAclAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); - jobject element_0_fabricIndexItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", - element_0_fabricIndexItem_1); - listHolder_0->mList[i_0].fabricIndex = - static_castmList[i_0].fabricIndex)>>( - chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); jobject element_0_privilegeItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "privilege", "Ljava/lang/Integer;", element_0_privilegeItem_1); @@ -192,6 +186,12 @@ JNI_METHOD(void, AccessControlCluster, writeAclAttribute) } } } + jobject element_0_fabricIndexItem_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", + element_0_fabricIndexItem_1); + listHolder_0->mList[i_0].fabricIndex = + static_castmList[i_0].fabricIndex)>>( + chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); } cppValue = ListType_0(listHolder_0->mList, valueSize); } @@ -264,17 +264,17 @@ JNI_METHOD(void, AccessControlCluster, writeExtensionAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); + jobject element_0_dataItem_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "data", "[B", element_0_dataItem_1); + cleanupByteArrays.push_back( + chip::Platform::MakeUnique(env, static_cast(element_0_dataItem_1))); + listHolder_0->mList[i_0].data = cleanupByteArrays.back()->byteSpan(); jobject element_0_fabricIndexItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", element_0_fabricIndexItem_1); listHolder_0->mList[i_0].fabricIndex = static_castmList[i_0].fabricIndex)>>( chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); - jobject element_0_dataItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "data", "[B", element_0_dataItem_1); - cleanupByteArrays.push_back( - chip::Platform::MakeUnique(env, static_cast(element_0_dataItem_1))); - listHolder_0->mList[i_0].data = cleanupByteArrays.back()->byteSpan(); } cppValue = ListType_0(listHolder_0->mList, valueSize); } @@ -607,12 +607,6 @@ JNI_METHOD(void, BindingCluster, writeBindingAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); - jobject element_0_fabricIndexItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", - element_0_fabricIndexItem_1); - listHolder_0->mList[i_0].fabricIndex = - static_castmList[i_0].fabricIndex)>>( - chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); jobject element_0_nodeItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "node", "Ljava/util/Optional;", element_0_nodeItem_1); if (element_0_nodeItem_1 != nullptr) @@ -668,6 +662,12 @@ JNI_METHOD(void, BindingCluster, writeBindingAttribute) chip::JniReferences::GetInstance().LongToPrimitive(optionalValue_2)); } } + jobject element_0_fabricIndexItem_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", + element_0_fabricIndexItem_1); + listHolder_0->mList[i_0].fabricIndex = + static_castmList[i_0].fabricIndex)>>( + chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); } cppValue = ListType_0(listHolder_0->mList, valueSize); } @@ -2037,12 +2037,6 @@ JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); - jobject element_0_fabricIndexItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", - element_0_fabricIndexItem_1); - listHolder_0->mList[i_0].fabricIndex = - static_castmList[i_0].fabricIndex)>>( - chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); jobject element_0_groupIdItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "groupId", "Ljava/lang/Integer;", element_0_groupIdItem_1); @@ -2054,6 +2048,12 @@ JNI_METHOD(void, GroupKeyManagementCluster, writeGroupKeyMapAttribute) listHolder_0->mList[i_0].groupKeySetID = static_castmList[i_0].groupKeySetID)>>( chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_groupKeySetIDItem_1)); + jobject element_0_fabricIndexItem_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", + element_0_fabricIndexItem_1); + listHolder_0->mList[i_0].fabricIndex = + static_castmList[i_0].fabricIndex)>>( + chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); } cppValue = ListType_0(listHolder_0->mList, valueSize); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 97656a3dd69e48..3b9a064bbfa057 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -732,12 +732,6 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_privilege; std::string newElement_0_privilegeClassName = "java/lang/Integer"; std::string newElement_0_privilegeCtorSignature = "(I)V"; @@ -846,6 +840,12 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn( chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_NaN); } } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass accessControlEntryStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -857,15 +857,15 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn( } jmethodID accessControlEntryStructCtor = env->GetMethodID( accessControlEntryStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"); + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); if (accessControlEntryStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlEntry constructor"); return; } - newElement_0 = env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_fabricIndex, - newElement_0_privilege, newElement_0_authMode, newElement_0_subjects, newElement_0_targets); + newElement_0 = env->NewObject(accessControlEntryStructClass, accessControlEntryStructCtor, newElement_0_privilege, + newElement_0_authMode, newElement_0_subjects, newElement_0_targets, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -932,17 +932,17 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; + jobject newElement_0_data; + jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast(entry_0.data.size())); + env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast(entry_0.data.size()), + reinterpret_cast(entry_0.data.data())); + newElement_0_data = newElement_0_dataByteArray; jobject newElement_0_fabricIndex; std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; std::string newElement_0_fabricIndexCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), newElement_0_fabricIndexCtorSignature.c_str(), entry_0.fabricIndex, newElement_0_fabricIndex); - jobject newElement_0_data; - jbyteArray newElement_0_dataByteArray = env->NewByteArray(static_cast(entry_0.data.size())); - env->SetByteArrayRegion(newElement_0_dataByteArray, 0, static_cast(entry_0.data.size()), - reinterpret_cast(entry_0.data.data())); - newElement_0_data = newElement_0_dataByteArray; jclass extensionEntryStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -952,7 +952,7 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn( ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterExtensionEntry"); return; } - jmethodID extensionEntryStructCtor = env->GetMethodID(extensionEntryStructClass, "", "(Ljava/lang/Integer;[B)V"); + jmethodID extensionEntryStructCtor = env->GetMethodID(extensionEntryStructClass, "", "([BLjava/lang/Integer;)V"); if (extensionEntryStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterExtensionEntry constructor"); @@ -960,7 +960,7 @@ void CHIPAccessControlExtensionAttributeCallback::CallbackFn( } newElement_0 = - env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_fabricIndex, newElement_0_data); + env->NewObject(extensionEntryStructClass, extensionEntryStructCtor, newElement_0_data, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -3302,12 +3302,6 @@ void CHIPBindingBindingAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_node; if (!entry_0.node.HasValue()) { @@ -3368,6 +3362,12 @@ void CHIPBindingBindingAttributeCallback::CallbackFn( entry_0.cluster.Value(), newElement_0_clusterInsideOptional); chip::JniReferences::GetInstance().CreateOptional(newElement_0_clusterInsideOptional, newElement_0_cluster); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass targetStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$BindingClusterTargetStruct", @@ -3379,15 +3379,15 @@ void CHIPBindingBindingAttributeCallback::CallbackFn( } jmethodID targetStructStructCtor = env->GetMethodID( targetStructStructClass, "", - "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V"); + "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V"); if (targetStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$BindingClusterTargetStruct constructor"); return; } - newElement_0 = env->NewObject(targetStructStructClass, targetStructStructCtor, newElement_0_fabricIndex, newElement_0_node, - newElement_0_group, newElement_0_endpoint, newElement_0_cluster); + newElement_0 = env->NewObject(targetStructStructClass, targetStructStructCtor, newElement_0_node, newElement_0_group, + newElement_0_endpoint, newElement_0_cluster, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -8880,12 +8880,6 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_groupId; std::string newElement_0_groupIdClassName = "java/lang/Integer"; std::string newElement_0_groupIdCtorSignature = "(I)V"; @@ -8898,6 +8892,12 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn( chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_groupKeySetIDClassName.c_str(), newElement_0_groupKeySetIDCtorSignature.c_str(), entry_0.groupKeySetID, newElement_0_groupKeySetID); + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass groupKeyMapStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -8915,8 +8915,8 @@ void CHIPGroupKeyManagementGroupKeyMapAttributeCallback::CallbackFn( return; } - newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_fabricIndex, - newElement_0_groupId, newElement_0_groupKeySetID); + newElement_0 = env->NewObject(groupKeyMapStructStructClass, groupKeyMapStructStructCtor, newElement_0_groupId, + newElement_0_groupKeySetID, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -8986,12 +8986,6 @@ void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_groupId; std::string newElement_0_groupIdClassName = "java/lang/Integer"; std::string newElement_0_groupIdCtorSignature = "(I)V"; @@ -9024,6 +9018,12 @@ void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn( env->NewStringUTF(std::string(entry_0.groupName.Value().data(), entry_0.groupName.Value().size()).c_str()); chip::JniReferences::GetInstance().CreateOptional(newElement_0_groupNameInsideOptional, newElement_0_groupName); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass groupInfoMapStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -9035,15 +9035,15 @@ void CHIPGroupKeyManagementGroupTableAttributeCallback::CallbackFn( } jmethodID groupInfoMapStructStructCtor = env->GetMethodID(groupInfoMapStructStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;)V"); + "(Ljava/lang/Integer;Ljava/util/ArrayList;Ljava/util/Optional;Ljava/lang/Integer;)V"); if (groupInfoMapStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$GroupKeyManagementClusterGroupInfoMapStruct constructor"); return; } - newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_fabricIndex, - newElement_0_groupId, newElement_0_endpoints, newElement_0_groupName); + newElement_0 = env->NewObject(groupInfoMapStructStructClass, groupInfoMapStructStructCtor, newElement_0_groupId, + newElement_0_endpoints, newElement_0_groupName, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -13908,12 +13908,6 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_noc; jbyteArray newElement_0_nocByteArray = env->NewByteArray(static_cast(entry_0.noc.size())); env->SetByteArrayRegion(newElement_0_nocByteArray, 0, static_cast(entry_0.noc.size()), @@ -13931,6 +13925,12 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn( reinterpret_cast(entry_0.icac.Value().data())); newElement_0_icac = newElement_0_icacByteArray; } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass NOCStructStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -13940,15 +13940,15 @@ void CHIPOperationalCredentialsNOCsAttributeCallback::CallbackFn( ChipLogError(Zcl, "Could not find class ChipStructs$OperationalCredentialsClusterNOCStruct"); return; } - jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "", "(Ljava/lang/Integer;[B[B)V"); + jmethodID NOCStructStructCtor = env->GetMethodID(NOCStructStructClass, "", "([B[BLjava/lang/Integer;)V"); if (NOCStructStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterNOCStruct constructor"); return; } - newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_fabricIndex, newElement_0_noc, - newElement_0_icac); + newElement_0 = env->NewObject(NOCStructStructClass, NOCStructStructCtor, newElement_0_noc, newElement_0_icac, + newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -14018,12 +14018,6 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_rootPublicKey; jbyteArray newElement_0_rootPublicKeyByteArray = env->NewByteArray(static_cast(entry_0.rootPublicKey.size())); env->SetByteArrayRegion(newElement_0_rootPublicKeyByteArray, 0, static_cast(entry_0.rootPublicKey.size()), @@ -14048,6 +14042,12 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn( newElement_0_nodeIdClassName.c_str(), newElement_0_nodeIdCtorSignature.c_str(), entry_0.nodeId, newElement_0_nodeId); jobject newElement_0_label; newElement_0_label = env->NewStringUTF(std::string(entry_0.label.data(), entry_0.label.size()).c_str()); + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass fabricDescriptorStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -14059,16 +14059,16 @@ void CHIPOperationalCredentialsFabricsAttributeCallback::CallbackFn( } jmethodID fabricDescriptorStructCtor = env->GetMethodID(fabricDescriptorStructClass, "", - "(Ljava/lang/Integer;[BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;)V"); + "([BLjava/lang/Integer;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Integer;)V"); if (fabricDescriptorStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OperationalCredentialsClusterFabricDescriptor constructor"); return; } - newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_fabricIndex, - newElement_0_rootPublicKey, newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, - newElement_0_label); + newElement_0 = env->NewObject(fabricDescriptorStructClass, fabricDescriptorStructCtor, newElement_0_rootPublicKey, + newElement_0_vendorId, newElement_0_fabricId, newElement_0_nodeId, newElement_0_label, + newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 259e808736ee83..6617ed7640e91e 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -55,32 +55,29 @@ public String toString() { } public static class AccessControlClusterAccessControlEntry { - public Integer fabricIndex; public Integer privilege; public Integer authMode; public @Nullable ArrayList subjects; public @Nullable ArrayList targets; + public Integer fabricIndex; public AccessControlClusterAccessControlEntry( - Integer fabricIndex, Integer privilege, Integer authMode, @Nullable ArrayList subjects, - @Nullable ArrayList targets) { - this.fabricIndex = fabricIndex; + @Nullable ArrayList targets, + Integer fabricIndex) { this.privilege = privilege; this.authMode = authMode; this.subjects = subjects; this.targets = targets; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("AccessControlClusterAccessControlEntry {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tprivilege: "); output.append(privilege); output.append("\n"); @@ -93,30 +90,33 @@ public String toString() { output.append("\ttargets: "); output.append(targets); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } } public static class AccessControlClusterExtensionEntry { - public Integer fabricIndex; public byte[] data; + public Integer fabricIndex; - public AccessControlClusterExtensionEntry(Integer fabricIndex, byte[] data) { - this.fabricIndex = fabricIndex; + public AccessControlClusterExtensionEntry(byte[] data, Integer fabricIndex) { this.data = data; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("AccessControlClusterExtensionEntry {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tdata: "); output.append(Arrays.toString(data)); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } @@ -226,32 +226,29 @@ public String toString() { } public static class BindingClusterTargetStruct { - public Integer fabricIndex; public Optional node; public Optional group; public Optional endpoint; public Optional cluster; + public Integer fabricIndex; public BindingClusterTargetStruct( - Integer fabricIndex, Optional node, Optional group, Optional endpoint, - Optional cluster) { - this.fabricIndex = fabricIndex; + Optional cluster, + Integer fabricIndex) { this.node = node; this.group = group; this.endpoint = endpoint; this.cluster = cluster; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("BindingClusterTargetStruct {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tnode: "); output.append(node); output.append("\n"); @@ -264,6 +261,9 @@ public String toString() { output.append("\tcluster: "); output.append(cluster); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } @@ -777,29 +777,26 @@ public String toString() { } public static class GroupKeyManagementClusterGroupInfoMapStruct { - public Integer fabricIndex; public Integer groupId; public ArrayList endpoints; public Optional groupName; + public Integer fabricIndex; public GroupKeyManagementClusterGroupInfoMapStruct( - Integer fabricIndex, Integer groupId, ArrayList endpoints, - Optional groupName) { - this.fabricIndex = fabricIndex; + Optional groupName, + Integer fabricIndex) { this.groupId = groupId; this.endpoints = endpoints; this.groupName = groupName; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("GroupKeyManagementClusterGroupInfoMapStruct {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tgroupId: "); output.append(groupId); output.append("\n"); @@ -809,36 +806,39 @@ public String toString() { output.append("\tgroupName: "); output.append(groupName); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } } public static class GroupKeyManagementClusterGroupKeyMapStruct { - public Integer fabricIndex; public Integer groupId; public Integer groupKeySetID; + public Integer fabricIndex; public GroupKeyManagementClusterGroupKeyMapStruct( - Integer fabricIndex, Integer groupId, Integer groupKeySetID) { - this.fabricIndex = fabricIndex; + Integer groupId, Integer groupKeySetID, Integer fabricIndex) { this.groupId = groupId; this.groupKeySetID = groupKeySetID; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("GroupKeyManagementClusterGroupKeyMapStruct {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tgroupId: "); output.append(groupId); output.append("\n"); output.append("\tgroupKeySetID: "); output.append(groupKeySetID); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } @@ -1185,35 +1185,32 @@ public String toString() { } public static class OperationalCredentialsClusterFabricDescriptor { - public Integer fabricIndex; public byte[] rootPublicKey; public Integer vendorId; public Long fabricId; public Long nodeId; public String label; + public Integer fabricIndex; public OperationalCredentialsClusterFabricDescriptor( - Integer fabricIndex, byte[] rootPublicKey, Integer vendorId, Long fabricId, Long nodeId, - String label) { - this.fabricIndex = fabricIndex; + String label, + Integer fabricIndex) { this.rootPublicKey = rootPublicKey; this.vendorId = vendorId; this.fabricId = fabricId; this.nodeId = nodeId; this.label = label; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("OperationalCredentialsClusterFabricDescriptor {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\trootPublicKey: "); output.append(Arrays.toString(rootPublicKey)); output.append("\n"); @@ -1229,36 +1226,39 @@ public String toString() { output.append("\tlabel: "); output.append(label); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } } public static class OperationalCredentialsClusterNOCStruct { - public Integer fabricIndex; public byte[] noc; public @Nullable byte[] icac; + public Integer fabricIndex; public OperationalCredentialsClusterNOCStruct( - Integer fabricIndex, byte[] noc, @Nullable byte[] icac) { - this.fabricIndex = fabricIndex; + byte[] noc, @Nullable byte[] icac, Integer fabricIndex) { this.noc = noc; this.icac = icac; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("OperationalCredentialsClusterNOCStruct {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tnoc: "); output.append(Arrays.toString(noc)); output.append("\n"); output.append("\ticac: "); output.append(Arrays.toString(icac)); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 81ef8395dc9063..085177c393e31c 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -5565,18 +5565,18 @@ class TargetStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="node", Tag=1, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="group", Tag=2, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="endpoint", Tag=3, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="cluster", Tag=4, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 node: 'typing.Optional[uint]' = None group: 'typing.Optional[uint]' = None endpoint: 'typing.Optional[uint]' = None cluster: 'typing.Optional[uint]' = None + fabricIndex: 'uint' = 0 @@ -5746,18 +5746,18 @@ class AccessControlEntry(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="privilege", Tag=1, Type=AccessControl.Enums.Privilege), ClusterObjectFieldDescriptor(Label="authMode", Tag=2, Type=AccessControl.Enums.AuthMode), ClusterObjectFieldDescriptor(Label="subjects", Tag=3, Type=typing.Union[Nullable, typing.List[uint]]), ClusterObjectFieldDescriptor(Label="targets", Tag=4, Type=typing.Union[Nullable, typing.List[AccessControl.Structs.Target]]), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 privilege: 'AccessControl.Enums.Privilege' = 0 authMode: 'AccessControl.Enums.AuthMode' = 0 subjects: 'typing.Union[Nullable, typing.List[uint]]' = NullValue targets: 'typing.Union[Nullable, typing.List[AccessControl.Structs.Target]]' = NullValue + fabricIndex: 'uint' = 0 @dataclass class ExtensionEntry(ClusterObject): @@ -5765,12 +5765,12 @@ class ExtensionEntry(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="data", Tag=1, Type=bytes), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 data: 'bytes' = b"" + fabricIndex: 'uint' = 0 @@ -14087,20 +14087,20 @@ class FabricDescriptor(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="rootPublicKey", Tag=1, Type=bytes), ClusterObjectFieldDescriptor(Label="vendorId", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="fabricId", Tag=3, Type=uint), ClusterObjectFieldDescriptor(Label="nodeId", Tag=4, Type=uint), ClusterObjectFieldDescriptor(Label="label", Tag=5, Type=str), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 rootPublicKey: 'bytes' = b"" vendorId: 'uint' = 0 fabricId: 'uint' = 0 nodeId: 'uint' = 0 label: 'str' = "" + fabricIndex: 'uint' = 0 @dataclass class NOCStruct(ClusterObject): @@ -14108,14 +14108,14 @@ class NOCStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="noc", Tag=1, Type=bytes), ClusterObjectFieldDescriptor(Label="icac", Tag=2, Type=typing.Union[Nullable, bytes]), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 noc: 'bytes' = b"" icac: 'typing.Union[Nullable, bytes]' = NullValue + fabricIndex: 'uint' = 0 @@ -14555,16 +14555,16 @@ class GroupInfoMapStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="endpoints", Tag=2, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="groupName", Tag=3, Type=typing.Optional[str]), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 groupId: 'uint' = 0 endpoints: 'typing.List[uint]' = field(default_factory=lambda: []) groupName: 'typing.Optional[str]' = None + fabricIndex: 'uint' = 0 @dataclass class GroupKeyMapStruct(ClusterObject): @@ -14572,14 +14572,14 @@ class GroupKeyMapStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="groupKeySetID", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 groupId: 'uint' = 0 groupKeySetID: 'uint' = 0 + fabricIndex: 'uint' = 0 @dataclass class GroupKeySetStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 5330268f99c07d..05e2497f9b13b8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -52,7 +52,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPAccessControlClusterAccessControlEntry * newElement_0; newElement_0 = [CHIPAccessControlClusterAccessControlEntry new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)]; newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)]; if (entry_0.subjects.IsNull()) { @@ -110,6 +109,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader newElement_0.targets = array_3; } } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -136,8 +136,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPAccessControlClusterExtensionEntry * newElement_0; newElement_0 = [CHIPAccessControlClusterExtensionEntry new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -1565,7 +1565,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPBindingClusterTargetStruct * newElement_0; newElement_0 = [CHIPBindingClusterTargetStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; if (entry_0.node.HasValue()) { newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()]; } else { @@ -1586,6 +1585,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader } else { newElement_0.cluster = nil; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -5219,9 +5219,9 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0; newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId]; newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -5248,7 +5248,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0; newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; @@ -5273,6 +5272,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader } else { newElement_0.groupName = nil; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -7697,13 +7697,13 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPOperationalCredentialsClusterNOCStruct * newElement_0; newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()]; if (entry_0.icac.IsNull()) { newElement_0.icac = nil; } else { newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()]; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -7730,7 +7730,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0; newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()]; newElement_0.vendorId = [NSNumber numberWithUnsignedShort:entry_0.vendorId]; @@ -7739,6 +7738,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index c16fbfaf47b22c..9a70ddbbdbd426 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -745,7 +745,6 @@ auto & entry_0 = iter_0.GetValue(); CHIPAccessControlClusterAccessControlEntry * newElement_0; newElement_0 = [CHIPAccessControlClusterAccessControlEntry new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.privilege = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.privilege)]; newElement_0.authMode = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.authMode)]; if (entry_0.subjects.IsNull()) { @@ -803,6 +802,7 @@ newElement_0.targets = array_3; } } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -842,8 +842,8 @@ auto & entry_0 = iter_0.GetValue(); CHIPAccessControlClusterExtensionEntry * newElement_0; newElement_0 = [CHIPAccessControlClusterExtensionEntry new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.data = [NSData dataWithBytes:entry_0.data.data() length:entry_0.data.size()]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -2134,7 +2134,6 @@ auto & entry_0 = iter_0.GetValue(); CHIPBindingClusterTargetStruct * newElement_0; newElement_0 = [CHIPBindingClusterTargetStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; if (entry_0.node.HasValue()) { newElement_0.node = [NSNumber numberWithUnsignedLongLong:entry_0.node.Value()]; } else { @@ -2155,6 +2154,7 @@ } else { newElement_0.cluster = nil; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4941,9 +4941,9 @@ auto & entry_0 = iter_0.GetValue(); CHIPGroupKeyManagementClusterGroupKeyMapStruct * newElement_0; newElement_0 = [CHIPGroupKeyManagementClusterGroupKeyMapStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId]; newElement_0.groupKeySetID = [NSNumber numberWithUnsignedShort:entry_0.groupKeySetID]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -4984,7 +4984,6 @@ auto & entry_0 = iter_0.GetValue(); CHIPGroupKeyManagementClusterGroupInfoMapStruct * newElement_0; newElement_0 = [CHIPGroupKeyManagementClusterGroupInfoMapStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.groupId = [NSNumber numberWithUnsignedShort:entry_0.groupId]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; @@ -5009,6 +5008,7 @@ } else { newElement_0.groupName = nil; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -7072,13 +7072,13 @@ auto & entry_0 = iter_0.GetValue(); CHIPOperationalCredentialsClusterNOCStruct * newElement_0; newElement_0 = [CHIPOperationalCredentialsClusterNOCStruct new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.noc = [NSData dataWithBytes:entry_0.noc.data() length:entry_0.noc.size()]; if (entry_0.icac.IsNull()) { newElement_0.icac = nil; } else { newElement_0.icac = [NSData dataWithBytes:entry_0.icac.Value().data() length:entry_0.icac.Value().size()]; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -7119,7 +7119,6 @@ auto & entry_0 = iter_0.GetValue(); CHIPOperationalCredentialsClusterFabricDescriptor * newElement_0; newElement_0 = [CHIPOperationalCredentialsClusterFabricDescriptor new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.rootPublicKey = [NSData dataWithBytes:entry_0.rootPublicKey.data() length:entry_0.rootPublicKey.size()]; newElement_0.vendorId = [NSNumber numberWithUnsignedShort:entry_0.vendorId]; newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; @@ -7127,6 +7126,7 @@ newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 6b2f538e2d02ec..f434ea0fa1e8c0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -81,7 +81,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPAccessControlClusterAccessControlEntry *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].privilege = static_castmList[i_0].privilege)>>( element_0.privilege.unsignedCharValue); @@ -159,6 +158,7 @@ new CHIPDefaultSuccessCallbackBridge( } } } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -255,8 +255,8 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPAccessControlClusterExtensionEntry *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].data = [self asByteSpan:element_0.data]; + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -5314,7 +5314,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPBindingClusterTargetStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; if (element_0.node != nil) { auto & definedValue_2 = listHolder_0->mList[i_0].node.Emplace(); definedValue_2 = element_0.node.unsignedLongLongValue; @@ -5331,6 +5330,7 @@ new CHIPDefaultSuccessCallbackBridge( auto & definedValue_2 = listHolder_0->mList[i_0].cluster.Emplace(); definedValue_2 = element_0.cluster.unsignedIntValue; } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -19796,9 +19796,9 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPGroupKeyManagementClusterGroupKeyMapStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue; listHolder_0->mList[i_0].groupKeySetID = element_0.groupKeySetID.unsignedShortValue; + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index 566e9d43fa369d..44dab81193894c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -62,11 +62,11 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPBindingClusterTargetStruct : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nullable node; @property (strong, nonatomic) NSNumber * _Nullable group; @property (strong, nonatomic) NSNumber * _Nullable endpoint; @property (strong, nonatomic) NSNumber * _Nullable cluster; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @@ -78,17 +78,17 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPAccessControlClusterAccessControlEntry : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nonnull privilege; @property (strong, nonatomic) NSNumber * _Nonnull authMode; @property (strong, nonatomic) NSArray * _Nullable subjects; @property (strong, nonatomic) NSArray * _Nullable targets; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @interface CHIPAccessControlClusterExtensionEntry : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSData * _Nonnull data; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @@ -251,34 +251,34 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPOperationalCredentialsClusterFabricDescriptor : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSData * _Nonnull rootPublicKey; @property (strong, nonatomic) NSNumber * _Nonnull vendorId; @property (strong, nonatomic) NSNumber * _Nonnull fabricId; @property (strong, nonatomic) NSNumber * _Nonnull nodeId; @property (strong, nonatomic) NSString * _Nonnull label; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @interface CHIPOperationalCredentialsClusterNOCStruct : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSData * _Nonnull noc; @property (strong, nonatomic) NSData * _Nullable icac; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @interface CHIPGroupKeyManagementClusterGroupInfoMapStruct : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nonnull groupId; @property (strong, nonatomic) NSArray * _Nonnull endpoints; @property (strong, nonatomic) NSString * _Nullable groupName; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end @interface CHIPGroupKeyManagementClusterGroupKeyMapStruct : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nonnull groupId; @property (strong, nonatomic) NSNumber * _Nonnull groupKeySetID; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 54ade50b9ccdb5..8da6ab5beb6ae0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -105,8 +105,6 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _node = nil; _group = nil; @@ -114,6 +112,8 @@ - (instancetype)init _endpoint = nil; _cluster = nil; + + _fabricIndex = @(0); } return self; } @@ -139,8 +139,6 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _privilege = @(0); _authMode = @(0); @@ -148,6 +146,8 @@ - (instancetype)init _subjects = nil; _targets = nil; + + _fabricIndex = @(0); } return self; } @@ -158,9 +158,9 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _data = [NSData data]; + + _fabricIndex = @(0); } return self; } @@ -504,8 +504,6 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _rootPublicKey = [NSData data]; _vendorId = @(0); @@ -515,6 +513,8 @@ - (instancetype)init _nodeId = @(0); _label = @""; + + _fabricIndex = @(0); } return self; } @@ -525,11 +525,11 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _noc = [NSData data]; _icac = nil; + + _fabricIndex = @(0); } return self; } @@ -540,13 +540,13 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _groupId = @(0); _endpoints = [NSArray array]; _groupName = nil; + + _fabricIndex = @(0); } return self; } @@ -557,11 +557,11 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _groupId = @(0); _groupKeySetID = @(0); + + _fabricIndex = @(0); } return self; } diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm index 73e16e163c828f..5386502f65fc23 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm @@ -7235,7 +7235,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPGroupKeyManagementClusterGroupInfoMapStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue; { using ListType_2 = std::remove_reference_tmList[i_0].endpoints)>; @@ -7263,6 +7262,7 @@ new CHIPDefaultSuccessCallbackBridge( auto & definedValue_2 = listHolder_0->mList[i_0].groupName.Emplace(); definedValue_2 = [self asCharSpan:element_0.groupName]; } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -10664,7 +10664,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPOperationalCredentialsClusterNOCStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].noc = [self asByteSpan:element_0.noc]; if (element_0.icac == nil) { listHolder_0->mList[i_0].icac.SetNull(); @@ -10672,6 +10671,7 @@ new CHIPDefaultSuccessCallbackBridge( auto & nonNullValue_2 = listHolder_0->mList[i_0].icac.SetNonNull(); nonNullValue_2 = [self asByteSpan:element_0.icac]; } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -10710,12 +10710,12 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPOperationalCredentialsClusterFabricDescriptor *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].rootPublicKey = [self asByteSpan:element_0.rootPublicKey]; listHolder_0->mList[i_0].vendorId = element_0.vendorId.unsignedShortValue; listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue; listHolder_0->mList[i_0].nodeId = element_0.nodeId.unsignedLongLongValue; listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label]; + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 2461419f977f32..92fcbbf92163c4 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -244,7 +244,6 @@ - (void)testSendClusterTestAccessControlCluster_000001_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; @@ -267,9 +266,9 @@ - (void)testSendClusterTestAccessControlCluster_000001_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -299,9 +298,9 @@ - (void)testSendClusterTestAccessControlCluster_000001_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[2] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).privilege = [NSNumber numberWithUnsignedChar:3]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).authMode = [NSNumber numberWithUnsignedChar:3]; { @@ -331,6 +330,7 @@ - (void)testSendClusterTestAccessControlCluster_000001_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -366,8 +366,6 @@ - (void)testSendClusterTestAccessControlCluster_000002_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 3); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( @@ -437,7 +435,7 @@ - (void)testSendClusterTestAccessControlCluster_000002_ReadAttribute .deviceType == nil); XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex unsignedCharValue], 1); + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).privilege unsignedCharValue], 1); XCTAssertEqual( @@ -520,7 +518,7 @@ - (void)testSendClusterTestAccessControlCluster_000002_ReadAttribute .deviceType == nil); XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).fabricIndex unsignedCharValue], 1); + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).privilege unsignedCharValue], 3); XCTAssertEqual( @@ -602,6 +600,8 @@ - (void)testSendClusterTestAccessControlCluster_000002_ReadAttribute .targets[2]) .deviceType == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -622,14 +622,13 @@ - (void)testSendClusterTestAccessControlCluster_000003_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -640,6 +639,7 @@ - (void)testSendClusterTestAccessControlCluster_000003_WriteAttribute NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -675,8 +675,6 @@ - (void)testSendClusterTestAccessControlCluster_000004_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 2); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( @@ -684,13 +682,15 @@ - (void)testSendClusterTestAccessControlCluster_000004_ReadAttribute XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex unsignedCharValue], 1); + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).privilege unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -711,18 +711,18 @@ - (void)testSendClusterTestAccessControlCluster_000005_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:3]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -757,14 +757,14 @@ - (void)testSendClusterTestAccessControlCluster_000006_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -785,18 +785,18 @@ - (void)testSendClusterTestAccessControlCluster_000007_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -831,14 +831,14 @@ - (void)testSendClusterTestAccessControlCluster_000008_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -859,14 +859,13 @@ - (void)testSendClusterTestAccessControlCluster_000009_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -875,6 +874,7 @@ - (void)testSendClusterTestAccessControlCluster_000009_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = temp_3; } ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -909,14 +909,14 @@ - (void)testSendClusterTestAccessControlCluster_000010_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -937,14 +937,13 @@ - (void)testSendClusterTestAccessControlCluster_000011_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; @@ -957,6 +956,7 @@ - (void)testSendClusterTestAccessControlCluster_000011_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -991,14 +991,14 @@ - (void)testSendClusterTestAccessControlCluster_000012_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -1019,14 +1019,13 @@ - (void)testSendClusterTestAccessControlCluster_000013_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -1054,6 +1053,7 @@ - (void)testSendClusterTestAccessControlCluster_000013_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = temp_3; } ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1088,14 +1088,14 @@ - (void)testSendClusterTestAccessControlCluster_000014_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -1116,14 +1116,13 @@ - (void)testSendClusterTestAccessControlCluster_000015_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; @@ -1231,6 +1230,7 @@ - (void)testSendClusterTestAccessControlCluster_000015_WriteAttribute ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1265,14 +1265,14 @@ - (void)testSendClusterTestAccessControlCluster_000016_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -1293,11 +1293,11 @@ - (void)testSendClusterTestAccessControlCluster_000017_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1333,14 +1333,14 @@ - (void)testSendClusterTestAccessControlCluster_000018_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual( - [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege unsignedCharValue], 5); XCTAssertEqual( [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).authMode unsignedCharValue], 2); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects == nil); XCTAssertTrue(((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets == nil); + XCTAssertEqual( + [((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -48178,14 +48178,14 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000008_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPGroupKeyManagementClusterGroupKeyMapStruct alloc] init]; - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupId = [NSNumber numberWithUnsignedShort:257U]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupKeySetID = [NSNumber numberWithUnsignedShort:417U]; + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; temp_0[1] = [[CHIPGroupKeyManagementClusterGroupKeyMapStruct alloc] init]; - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).groupId = [NSNumber numberWithUnsignedShort:258U]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).groupKeySetID = [NSNumber numberWithUnsignedShort:418U]; + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; groupKeyMapArgument = temp_0; } @@ -48220,9 +48220,6 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000009_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 2); - XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) - actualValue[0]).fabricIndex unsignedCharValue], - 1); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[0]).groupId unsignedShortValue], 257U); @@ -48230,7 +48227,7 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000009_ReadAttribute actualValue[0]).groupKeySetID unsignedShortValue], 417U); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) - actualValue[1]).fabricIndex unsignedCharValue], + actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).groupId unsignedShortValue], @@ -48238,6 +48235,9 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000009_ReadAttribute XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).groupKeySetID unsignedShortValue], 418U); + XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) + actualValue[1]).fabricIndex unsignedCharValue], + 1); } [expectation fulfill]; @@ -48265,22 +48265,22 @@ - (void)testSendClusterTestGroupKeyManagementCluster_000010_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 2); - XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) - actualValue[0]).fabricIndex unsignedCharValue], - 1); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupId unsignedShortValue], 257U); XCTAssertTrue([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupName isEqualToString:@"Group #1"]); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) - actualValue[1]).fabricIndex unsignedCharValue], + actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupId unsignedShortValue], 258U); XCTAssertTrue([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupName isEqualToString:@"Group #2"]); + XCTAssertEqual([((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) + actualValue[1]).fabricIndex unsignedCharValue], + 1); } [expectation fulfill]; @@ -48648,11 +48648,11 @@ - (void)testSendClusterTestOperationalCredentialsCluster_000005_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); + XCTAssertTrue([((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label + isEqualToString:@""]); XCTAssertEqualObjects( ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).fabricIndex, ourFabricIndex); - XCTAssertTrue([((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label - isEqualToString:@""]); } [expectation fulfill]; @@ -48716,11 +48716,11 @@ - (void)testSendClusterTestOperationalCredentialsCluster_000007_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); + XCTAssertTrue([((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label + isEqualToString:@"Batcave"]); XCTAssertEqualObjects( ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).fabricIndex, ourFabricIndex); - XCTAssertTrue([((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label - isEqualToString:@"Batcave"]); } [expectation fulfill]; @@ -49010,11 +49010,11 @@ - (void)testSendClusterTestBinding_000003_WriteAttribute ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).node = [NSNumber numberWithUnsignedLongLong:1ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).group = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).endpoint = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).cluster = [NSNumber numberWithUnsignedInt:6UL]; + ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -49041,19 +49041,19 @@ - (void)testSendClusterTestBinding_000004_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).group = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).node = [NSNumber numberWithUnsignedLongLong:1ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).endpoint = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).cluster = [NSNumber numberWithUnsignedInt:6UL]; + ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[2] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[2]).node = [NSNumber numberWithUnsignedLongLong:2ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[2]).endpoint = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -49089,15 +49089,15 @@ - (void)testSendClusterTestBinding_000005_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 3); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).group unsignedShortValue], 1U); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex unsignedCharValue], 1); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).node unsignedLongLongValue], 1ULL); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).endpoint unsignedShortValue], 1U); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).cluster unsignedIntValue], 6UL); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex unsignedCharValue], 1); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).node unsignedLongLongValue], 2ULL); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).endpoint unsignedShortValue], 1U); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -49118,9 +49118,9 @@ - (void)testSendClusterTestBinding_000006_WriteAttribute { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).node = [NSNumber numberWithUnsignedLongLong:3ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).endpoint = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -49156,9 +49156,9 @@ - (void)testSendClusterTestBinding_000007_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 1); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).node unsignedLongLongValue], 3ULL); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).endpoint unsignedShortValue], 1U); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; @@ -49187,15 +49187,15 @@ - (void)testSendClusterTestBinding_000008_ReadAttribute { id actualValue = value; XCTAssertEqual([actualValue count], 3); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).group unsignedShortValue], 1U); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex unsignedCharValue], 1); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).node unsignedLongLongValue], 1ULL); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).endpoint unsignedShortValue], 1U); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).cluster unsignedIntValue], 6UL); - XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex unsignedCharValue], 1); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex unsignedCharValue], 1); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).node unsignedLongLongValue], 2ULL); XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).endpoint unsignedShortValue], 1U); + XCTAssertEqual([((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex unsignedCharValue], 1); } [expectation fulfill]; 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 index 5fedd6a584ef31..b3080ac3d3d71d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -170,11 +170,11 @@ typedef struct _Target // Struct for AccessControlEntry typedef struct _AccessControlEntry { - chip::FabricIndex FabricIndex; uint8_t Privilege; uint8_t AuthMode; /* TYPE WARNING: array array defaults to */ uint8_t * Subjects; /* TYPE WARNING: array array defaults to */ uint8_t * Targets; + chip::FabricIndex FabricIndex; } AccessControlEntry; // Struct for ActionStruct @@ -251,36 +251,36 @@ typedef struct _EndpointListStruct // Struct for ExtensionEntry typedef struct _ExtensionEntry { - chip::FabricIndex FabricIndex; chip::ByteSpan Data; + chip::FabricIndex FabricIndex; } ExtensionEntry; // Struct for FabricDescriptor typedef struct _FabricDescriptor { - chip::FabricIndex FabricIndex; chip::ByteSpan RootPublicKey; uint16_t VendorId; chip::FabricId FabricId; chip::NodeId NodeId; chip::CharSpan Label; + chip::FabricIndex FabricIndex; } FabricDescriptor; // Struct for GroupInfoMapStruct typedef struct _GroupInfoMapStruct { - chip::FabricIndex FabricIndex; chip::GroupId GroupId; /* TYPE WARNING: array array defaults to */ uint8_t * Endpoints; chip::CharSpan GroupName; + chip::FabricIndex FabricIndex; } GroupInfoMapStruct; // Struct for GroupKeyMapStruct typedef struct _GroupKeyMapStruct { - chip::FabricIndex FabricIndex; chip::GroupId GroupId; uint16_t GroupKeySetID; + chip::FabricIndex FabricIndex; } GroupKeyMapStruct; // Struct for GroupKeySetStruct @@ -339,9 +339,9 @@ typedef struct _ModeOptionStruct // Struct for NOCStruct typedef struct _NOCStruct { - chip::FabricIndex FabricIndex; chip::ByteSpan NOC; chip::ByteSpan ICAC; + chip::FabricIndex FabricIndex; } NOCStruct; // Struct for NeighborTable @@ -525,11 +525,11 @@ typedef struct _TargetInfo // Struct for TargetStruct typedef struct _TargetStruct { - chip::FabricIndex FabricIndex; chip::NodeId Node; chip::GroupId Group; chip::EndpointId Endpoint; chip::ClusterId Cluster; + chip::FabricIndex FabricIndex; } TargetStruct; // Struct for TestListStructOctet 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 index c32353bbd1d684..d5ec9f7b32ddb6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -4453,14 +4453,14 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - if (accessingFabricIndex.HasValue()) - { - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); - } ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNode)), node)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroup)), group)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoint)), endpoint)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCluster)), cluster)); + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -4477,9 +4477,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kNode): ReturnErrorOnFailure(DataModel::Decode(reader, node)); break; @@ -4492,6 +4489,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kCluster): ReturnErrorOnFailure(DataModel::Decode(reader, cluster)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -4607,10 +4607,6 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex); TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - if (accessingFabricIndex.HasValue()) - { - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); - } if (includeSensitive) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPrivilege)), privilege)); @@ -4627,6 +4623,10 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTargets)), targets)); } + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -4643,9 +4643,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kPrivilege): ReturnErrorOnFailure(DataModel::Decode(reader, privilege)); break; @@ -4658,6 +4655,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kTargets): ReturnErrorOnFailure(DataModel::Decode(reader, targets)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -4685,11 +4685,11 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); if (accessingFabricIndex.HasValue()) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); } - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kData)), data)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -4706,12 +4706,12 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kData): ReturnErrorOnFailure(DataModel::Decode(reader, data)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -10198,15 +10198,15 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - if (accessingFabricIndex.HasValue()) - { - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); - } ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRootPublicKey)), rootPublicKey)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricId)), fabricId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNodeId)), nodeId)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kLabel)), label)); + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10223,9 +10223,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kRootPublicKey): ReturnErrorOnFailure(DataModel::Decode(reader, rootPublicKey)); break; @@ -10241,6 +10238,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLabel): ReturnErrorOnFailure(DataModel::Decode(reader, label)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -10269,10 +10269,6 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex); TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - if (accessingFabricIndex.HasValue()) - { - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); - } if (includeSensitive) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNoc)), noc)); @@ -10281,6 +10277,10 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kIcac)), icac)); } + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10297,15 +10297,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kNoc): ReturnErrorOnFailure(DataModel::Decode(reader, noc)); break; case to_underlying(Fields::kIcac): ReturnErrorOnFailure(DataModel::Decode(reader, icac)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -10871,13 +10871,13 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoints)), endpoints)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupName)), groupName)); if (accessingFabricIndex.HasValue()) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); } - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoints)), endpoints)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupName)), groupName)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10894,9 +10894,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kGroupId): ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); break; @@ -10906,6 +10903,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kGroupName): ReturnErrorOnFailure(DataModel::Decode(reader, groupName)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } @@ -10933,12 +10933,12 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySetID)), groupKeySetID)); if (accessingFabricIndex.HasValue()) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); } - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySetID)), groupKeySetID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10955,15 +10955,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kGroupId): ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); break; case to_underlying(Fields::kGroupKeySetID): ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySetID)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } 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 index 0dd2d68e998832..2b8f73dc6bdc80 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -6484,21 +6484,21 @@ namespace Structs { namespace TargetStruct { enum class Fields { - kFabricIndex = 0, kNode = 1, kGroup = 2, kEndpoint = 3, kCluster = 4, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); Optional node; Optional group; Optional endpoint; Optional cluster; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -6644,21 +6644,21 @@ using DecodableType = Type; namespace AccessControlEntry { enum class Fields { - kFabricIndex = 0, kPrivilege = 1, kAuthMode = 2, kSubjects = 3, kTargets = 4, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); - Privilege privilege = static_cast(0); - AuthMode authMode = static_cast(0); + Privilege privilege = static_cast(0); + AuthMode authMode = static_cast(0); DataModel::Nullable> subjects; DataModel::Nullable> targets; + chip::FabricIndex fabricIndex = static_cast(0); static constexpr bool kIsFabricScoped = true; @@ -6676,11 +6676,11 @@ struct Type struct DecodableType { public: - chip::FabricIndex fabricIndex = static_cast(0); - Privilege privilege = static_cast(0); - AuthMode authMode = static_cast(0); + Privilege privilege = static_cast(0); + AuthMode authMode = static_cast(0); DataModel::Nullable> subjects; DataModel::Nullable> targets; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -6695,15 +6695,15 @@ struct DecodableType namespace ExtensionEntry { enum class Fields { - kFabricIndex = 0, kData = 1, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); chip::ByteSpan data; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15050,23 +15050,23 @@ namespace Structs { namespace FabricDescriptor { enum class Fields { - kFabricIndex = 0, kRootPublicKey = 1, kVendorId = 2, kFabricId = 3, kNodeId = 4, kLabel = 5, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); chip::ByteSpan rootPublicKey; uint16_t vendorId = static_cast(0); chip::FabricId fabricId = static_cast(0); chip::NodeId nodeId = static_cast(0); chip::CharSpan label; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15089,17 +15089,17 @@ using DecodableType = Type; namespace NOCStruct { enum class Fields { - kFabricIndex = 0, kNoc = 1, kIcac = 2, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); chip::ByteSpan noc; DataModel::Nullable icac; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15804,19 +15804,19 @@ namespace Structs { namespace GroupInfoMapStruct { enum class Fields { - kFabricIndex = 0, kGroupId = 1, kEndpoints = 2, kGroupName = 3, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); - chip::GroupId groupId = static_cast(0); + chip::GroupId groupId = static_cast(0); DataModel::List endpoints; Optional groupName; + chip::FabricIndex fabricIndex = static_cast(0); static constexpr bool kIsFabricScoped = true; @@ -15834,10 +15834,10 @@ struct Type struct DecodableType { public: - chip::FabricIndex fabricIndex = static_cast(0); - chip::GroupId groupId = static_cast(0); + chip::GroupId groupId = static_cast(0); DataModel::DecodableList endpoints; Optional groupName; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15852,17 +15852,17 @@ struct DecodableType namespace GroupKeyMapStruct { enum class Fields { - kFabricIndex = 0, kGroupId = 1, kGroupKeySetID = 2, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); chip::GroupId groupId = static_cast(0); uint16_t groupKeySetID = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm index 73e16e163c828f..5386502f65fc23 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm @@ -7235,7 +7235,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPGroupKeyManagementClusterGroupInfoMapStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].groupId = element_0.groupId.unsignedShortValue; { using ListType_2 = std::remove_reference_tmList[i_0].endpoints)>; @@ -7263,6 +7262,7 @@ new CHIPDefaultSuccessCallbackBridge( auto & definedValue_2 = listHolder_0->mList[i_0].groupName.Emplace(); definedValue_2 = [self asCharSpan:element_0.groupName]; } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -10664,7 +10664,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPOperationalCredentialsClusterNOCStruct *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].noc = [self asByteSpan:element_0.noc]; if (element_0.icac == nil) { listHolder_0->mList[i_0].icac.SetNull(); @@ -10672,6 +10671,7 @@ new CHIPDefaultSuccessCallbackBridge( auto & nonNullValue_2 = listHolder_0->mList[i_0].icac.SetNonNull(); nonNullValue_2 = [self asByteSpan:element_0.icac]; } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { @@ -10710,12 +10710,12 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPOperationalCredentialsClusterFabricDescriptor *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].rootPublicKey = [self asByteSpan:element_0.rootPublicKey]; listHolder_0->mList[i_0].vendorId = element_0.vendorId.unsignedShortValue; listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue; listHolder_0->mList[i_0].nodeId = element_0.nodeId.unsignedLongLongValue; listHolder_0->mList[i_0].label = [self asCharSpan:element_0.label]; + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h index 6611ee287ae9c1..505d920323d6c3 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h @@ -326,7 +326,6 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; @@ -349,9 +348,9 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -381,9 +380,9 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[2] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).privilege = [NSNumber numberWithUnsignedChar:3]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).authMode = [NSNumber numberWithUnsignedChar:3]; { @@ -413,6 +412,7 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -446,8 +446,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(3))); - VerifyOrReturn(CheckValue( - "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -516,7 +514,7 @@ class TestAccessControlCluster : public TestCommandBridge { .targets[2]) .deviceType)); VerifyOrReturn(CheckValue( - "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex, 1)); + "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).privilege, 1)); VerifyOrReturn(CheckValue( @@ -596,7 +594,7 @@ class TestAccessControlCluster : public TestCommandBridge { .targets[2]) .deviceType)); VerifyOrReturn(CheckValue( - "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).fabricIndex, 1)); + "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).privilege, 3)); VerifyOrReturn(CheckValue( @@ -675,6 +673,8 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterTarget *) ((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]) .targets[2]) .deviceType)); + VerifyOrReturn(CheckValue( + "FabricIndex", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[2]).fabricIndex, 1)); } NextTest(); @@ -693,14 +693,13 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -711,6 +710,7 @@ class TestAccessControlCluster : public TestCommandBridge { NSMutableArray * temp_3 = [[NSMutableArray alloc] init]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -743,8 +743,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -754,7 +752,7 @@ class TestAccessControlCluster : public TestCommandBridge { VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex, 1)); + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).privilege, 1)); VerifyOrReturn(CheckValue( @@ -763,6 +761,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[1]).fabricIndex, 1)); } NextTest(); @@ -781,18 +781,18 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:3]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -824,8 +824,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -834,6 +832,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -852,18 +852,18 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -895,8 +895,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -905,6 +903,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -923,14 +923,13 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -939,6 +938,7 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = temp_3; } ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -970,8 +970,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -980,6 +978,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -998,14 +998,13 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; @@ -1018,6 +1017,7 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1049,8 +1049,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -1059,6 +1057,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -1077,14 +1077,13 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; { @@ -1112,6 +1111,7 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = temp_3; } ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1143,8 +1143,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -1153,6 +1151,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -1171,14 +1171,13 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).privilege = [NSNumber numberWithUnsignedChar:1]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).subjects = nil; @@ -1286,6 +1285,7 @@ class TestAccessControlCluster : public TestCommandBridge { ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).targets = temp_3; } + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1317,8 +1317,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -1327,6 +1325,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -1345,11 +1345,11 @@ class TestAccessControlCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPAccessControlClusterAccessControlEntry alloc] init]; - ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).privilege = [NSNumber numberWithUnsignedChar:5]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).authMode = [NSNumber numberWithUnsignedChar:2]; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).subjects = nil; ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).targets = nil; + ((CHIPAccessControlClusterAccessControlEntry *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; aclArgument = temp_0; } @@ -1382,8 +1382,6 @@ class TestAccessControlCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("ACL", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue( "Privilege", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).privilege, 5)); VerifyOrReturn(CheckValue( @@ -1392,6 +1390,8 @@ class TestAccessControlCluster : public TestCommandBridge { "Subjects", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).subjects)); VerifyOrReturn(CheckValueNull( "Targets", ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).targets)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPAccessControlClusterAccessControlEntry *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -55049,14 +55049,14 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPGroupKeyManagementClusterGroupKeyMapStruct alloc] init]; - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupId = [NSNumber numberWithUnsignedShort:257U]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).groupKeySetID = [NSNumber numberWithUnsignedShort:417U]; + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; temp_0[1] = [[CHIPGroupKeyManagementClusterGroupKeyMapStruct alloc] init]; - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).groupId = [NSNumber numberWithUnsignedShort:258U]; ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).groupKeySetID = [NSNumber numberWithUnsignedShort:418U]; + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:1]; groupKeyMapArgument = temp_0; } @@ -55092,18 +55092,18 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("GroupKeyMap", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("GroupId", ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[0]).groupId, 257U)); VerifyOrReturn(CheckValue("GroupKeySetID", ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[0]).groupKeySetID, 417U)); VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).fabricIndex, 1)); + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("GroupId", ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).groupId, 258U)); VerifyOrReturn(CheckValue("GroupKeySetID", ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).groupKeySetID, 418U)); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPGroupKeyManagementClusterGroupKeyMapStruct *) actualValue[1]).fabricIndex, 1)); } NextTest(); @@ -55131,20 +55131,20 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("GroupTable", [actualValue count], static_cast(2))); - VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("GroupId", ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupId, 257U)); VerifyOrReturn(CheckValueAsString("GroupName", ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupName, @"Group #1")); VerifyOrReturn(CheckValue("FabricIndex", - ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).fabricIndex, 1)); + ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("GroupId", ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupId, 258U)); VerifyOrReturn(CheckValueAsString("GroupName", ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupName, @"Group #2")); + VerifyOrReturn(CheckValue("FabricIndex", + ((CHIPGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).fabricIndex, 1)); } NextTest(); @@ -55710,11 +55710,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast(1))); + VerifyOrReturn(CheckValueAsString("Label", + ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @"")); VerifyOrReturn(CheckValue("FabricIndex", ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).fabricIndex, ourFabricIndex)); - VerifyOrReturn(CheckValueAsString("Label", - ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @"")); } NextTest(); @@ -55776,11 +55776,11 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast(1))); + VerifyOrReturn(CheckValueAsString("Label", + ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @"Batcave")); VerifyOrReturn(CheckValue("FabricIndex", ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).fabricIndex, ourFabricIndex)); - VerifyOrReturn(CheckValueAsString("Label", - ((CHIPOperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @"Batcave")); } NextTest(); @@ -56238,11 +56238,11 @@ class TestBinding : public TestCommandBridge { ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).node = [NSNumber numberWithUnsignedLongLong:1ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).group = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).endpoint = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).cluster = [NSNumber numberWithUnsignedInt:6UL]; + ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -56267,19 +56267,19 @@ class TestBinding : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).group = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[1] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).node = [NSNumber numberWithUnsignedLongLong:1ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).endpoint = [NSNumber numberWithUnsignedShort:1U]; ((CHIPBindingClusterTargetStruct *) temp_0[1]).cluster = [NSNumber numberWithUnsignedInt:6UL]; + ((CHIPBindingClusterTargetStruct *) temp_0[1]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; temp_0[2] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[2]).node = [NSNumber numberWithUnsignedLongLong:2ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[2]).endpoint = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[2]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -56313,21 +56313,21 @@ class TestBinding : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("Binding", [actualValue count], static_cast(3))); - VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Group", ((CHIPBindingClusterTargetStruct *) actualValue[0]).group, 1U)); VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex, 1)); + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[1]).node, 1ULL)); VerifyOrReturn( CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[1]).endpoint, 1U)); VerifyOrReturn( CheckValue("Cluster", ((CHIPBindingClusterTargetStruct *) actualValue[1]).cluster, 6UL)); VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex, 1)); + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[2]).node, 2ULL)); VerifyOrReturn( CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[2]).endpoint, 1U)); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex, 1)); } NextTest(); @@ -56346,9 +56346,9 @@ class TestBinding : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPBindingClusterTargetStruct alloc] init]; - ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).node = [NSNumber numberWithUnsignedLongLong:3ULL]; ((CHIPBindingClusterTargetStruct *) temp_0[0]).endpoint = [NSNumber numberWithUnsignedShort:1U]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; bindingArgument = temp_0; } @@ -56382,11 +56382,11 @@ class TestBinding : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("Binding", [actualValue count], static_cast(1))); - VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[0]).node, 3ULL)); VerifyOrReturn( CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[0]).endpoint, 1U)); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); } NextTest(); @@ -56413,21 +56413,21 @@ class TestBinding : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("Binding", [actualValue count], static_cast(3))); - VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Group", ((CHIPBindingClusterTargetStruct *) actualValue[0]).group, 1U)); VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex, 1)); + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[1]).node, 1ULL)); VerifyOrReturn( CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[1]).endpoint, 1U)); VerifyOrReturn( CheckValue("Cluster", ((CHIPBindingClusterTargetStruct *) actualValue[1]).cluster, 6UL)); VerifyOrReturn( - CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex, 1)); + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex, 1)); VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[2]).node, 2ULL)); VerifyOrReturn( CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[2]).endpoint, 1U)); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex, 1)); } NextTest(); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 2b02c0cf0555b6..9a1763681ae755 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -25,8 +25,6 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("AccessControlEntry.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("AccessControlEntry.privilege", "privilege", value.isMember("privilege"))); ReturnErrorOnFailure( @@ -35,11 +33,10 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, ComplexArgumentParser::EnsureMemberExist("AccessControlEntry.subjects", "subjects", value.isMember("subjects"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("AccessControlEntry.targets", "targets", value.isMember("targets"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("AccessControlEntry.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "privilege"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.privilege, value["privilege"])); @@ -52,16 +49,19 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "targets"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.targets, value["targets"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.privilege); ComplexArgumentParser::Finalize(request.authMode); ComplexArgumentParser::Finalize(request.subjects); ComplexArgumentParser::Finalize(request.targets); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type & request, @@ -545,24 +545,24 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ExtensionEntry.data", "data", value.isMember("data"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("ExtensionEntry.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ExtensionEntry.data", "data", value.isMember("data"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "data"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.data, value["data"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.data); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::Type & request, @@ -570,8 +570,6 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.rootPublicKey", "rootPublicKey", value.isMember("rootPublicKey"))); ReturnErrorOnFailure( @@ -580,11 +578,10 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.fabricId", "fabricId", value.isMember("fabricId"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.nodeId", "nodeId", value.isMember("nodeId"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.label", "label", value.isMember("label"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("FabricDescriptor.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "rootPublicKey"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.rootPublicKey, value["rootPublicKey"])); @@ -600,17 +597,20 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "label"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.label, value["label"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.rootPublicKey); ComplexArgumentParser::Finalize(request.vendorId); ComplexArgumentParser::Finalize(request.fabricId); ComplexArgumentParser::Finalize(request.nodeId); ComplexArgumentParser::Finalize(request.label); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::Type & request, @@ -618,17 +618,14 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("GroupInfoMapStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("GroupInfoMapStruct.groupId", "groupId", value.isMember("groupId"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("GroupInfoMapStruct.endpoints", "endpoints", value.isMember("endpoints"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("GroupInfoMapStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupId"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.groupId, value["groupId"])); @@ -641,15 +638,18 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.groupName, value["groupName"])); } + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.groupId); ComplexArgumentParser::Finalize(request.endpoints); ComplexArgumentParser::Finalize(request.groupName); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type & request, @@ -657,31 +657,31 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("GroupKeyMapStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("GroupKeyMapStruct.groupId", "groupId", value.isMember("groupId"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("GroupKeyMapStruct.groupKeySetID", "groupKeySetID", value.isMember("groupKeySetID"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("GroupKeyMapStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupId"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.groupId, value["groupId"])); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "groupKeySetID"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.groupKeySetID, value["groupKeySetID"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.groupId); ComplexArgumentParser::Finalize(request.groupKeySetID); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::GroupKeyManagement::Structs::GroupKeySetStruct::Type & request, @@ -904,29 +904,29 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("NOCStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NOCStruct.noc", "noc", value.isMember("noc"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("NOCStruct.icac", "icac", value.isMember("icac"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("NOCStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "noc"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.noc, value["noc"])); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "icac"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.icac, value["icac"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.noc); ComplexArgumentParser::Finalize(request.icac); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::Type & request, @@ -1890,9 +1890,6 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: ComplexArgumentParser::EnsureMemberExist("TargetStruct.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - if (value.isMember("node")) { snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "node"); @@ -1917,16 +1914,19 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.cluster, value["cluster"])); } + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::Binding::Structs::TargetStruct::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.node); ComplexArgumentParser::Finalize(request.group); ComplexArgumentParser::Finalize(request.endpoint); ComplexArgumentParser::Finalize(request.cluster); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type & request, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 0ecc381437c736..07a85e878626d3 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -25,14 +25,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); - return err; - } - } { CHIP_ERROR err = LogValue("Privilege", indent + 1, value.privilege); if (err != CHIP_NO_ERROR) @@ -65,6 +57,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -550,18 +550,18 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + CHIP_ERROR err = LogValue("Data", indent + 1, value.data); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Data'"); return err; } } { - CHIP_ERROR err = LogValue("Data", indent + 1, value.data); + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Data'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); return err; } } @@ -574,14 +574,6 @@ DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); - return err; - } - } { CHIP_ERROR err = LogValue("RootPublicKey", indent + 1, value.rootPublicKey); if (err != CHIP_NO_ERROR) @@ -622,6 +614,14 @@ DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -631,14 +631,6 @@ DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::GroupKeyManagement::Structs::GroupInfoMapStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); - return err; - } - } { CHIP_ERROR err = LogValue("GroupId", indent + 1, value.groupId); if (err != CHIP_NO_ERROR) @@ -663,6 +655,14 @@ DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -673,26 +673,26 @@ DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + CHIP_ERROR err = LogValue("GroupId", indent + 1, value.groupId); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupId'"); return err; } } { - CHIP_ERROR err = LogValue("GroupId", indent + 1, value.groupId); + CHIP_ERROR err = LogValue("GroupKeySetID", indent + 1, value.groupKeySetID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupId'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupKeySetID'"); return err; } } { - CHIP_ERROR err = LogValue("GroupKeySetID", indent + 1, value.groupKeySetID); + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'GroupKeySetID'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); return err; } } @@ -938,26 +938,26 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + CHIP_ERROR err = LogValue("Noc", indent + 1, value.noc); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Noc'"); return err; } } { - CHIP_ERROR err = LogValue("Noc", indent + 1, value.noc); + CHIP_ERROR err = LogValue("Icac", indent + 1, value.icac); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Noc'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Icac'"); return err; } } { - CHIP_ERROR err = LogValue("Icac", indent + 1, value.icac); + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Icac'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); return err; } } @@ -2041,14 +2041,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); - return err; - } - } { CHIP_ERROR err = LogValue("Node", indent + 1, value.node); if (err != CHIP_NO_ERROR) @@ -2081,6 +2073,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index a2eecf03d9d76c..daa0fe2b717dda 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -747,9 +747,8 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(3); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNonNull(); @@ -776,10 +775,10 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[0].targets.Value() = chip::app::DataModel::List(listHolder_3->mList, 3); } + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNonNull(); { @@ -816,10 +815,10 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].targets.Value() = chip::app::DataModel::List(listHolder_3->mList, 3); } + listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[2].fabricIndex = 0; - listHolder_0->mList[2].privilege = static_cast(3); - listHolder_0->mList[2].authMode = static_cast(3); + listHolder_0->mList[2].privilege = static_cast(3); + listHolder_0->mList[2].authMode = static_cast(3); listHolder_0->mList[2].subjects.SetNonNull(); { @@ -856,6 +855,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[2].targets.Value() = chip::app::DataModel::List(listHolder_3->mList, 3); } + listHolder_0->mList[2].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 3); @@ -898,7 +898,6 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); @@ -927,8 +926,8 @@ class TestAccessControlClusterSuite : public TestCommand VerifyOrReturn( CheckNoMoreListItems("acl[0].targets.Value()", iter_NaN, 3)); } + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 1)); - VerifyOrReturn(CheckValue("acl[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[1].privilege", iter_0.GetValue().privilege, 1)); VerifyOrReturn(CheckValue("acl[1].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNonNull("acl[1].subjects", iter_0.GetValue().subjects)); @@ -974,8 +973,8 @@ class TestAccessControlClusterSuite : public TestCommand VerifyOrReturn( CheckNoMoreListItems("acl[1].targets.Value()", iter_NaN, 3)); } + VerifyOrReturn(CheckValue("acl[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 2)); - VerifyOrReturn(CheckValue("acl[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[2].privilege", iter_0.GetValue().privilege, 3)); VerifyOrReturn(CheckValue("acl[2].authMode", iter_0.GetValue().authMode, 3)); VerifyOrReturn(CheckValueNonNull("acl[2].subjects", iter_0.GetValue().subjects)); @@ -1021,6 +1020,7 @@ class TestAccessControlClusterSuite : public TestCommand VerifyOrReturn( CheckNoMoreListItems("acl[2].targets.Value()", iter_NaN, 3)); } + VerifyOrReturn(CheckValue("acl[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 3)); } @@ -1040,15 +1040,14 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNonNull(); listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List(); @@ -1056,6 +1055,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].targets.Value() = chip::app::DataModel::List(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1098,17 +1098,17 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 1)); - VerifyOrReturn(CheckValue("acl[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[1].privilege", iter_0.GetValue().privilege, 1)); VerifyOrReturn(CheckValue("acl[1].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[1].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[1].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 2)); } @@ -1128,17 +1128,17 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(5); - listHolder_0->mList[1].authMode = static_cast(3); + listHolder_0->mList[1].privilege = static_cast(5); + listHolder_0->mList[1].authMode = static_cast(3); listHolder_0->mList[1].subjects.SetNull(); listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1182,11 +1182,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1206,17 +1206,17 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(1); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(1); listHolder_0->mList[1].subjects.SetNull(); listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1260,11 +1260,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1284,15 +1284,14 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNonNull(); { @@ -1302,6 +1301,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1345,11 +1345,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1369,15 +1369,14 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNull(); listHolder_0->mList[1].targets.SetNonNull(); @@ -1392,6 +1391,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].targets.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1435,11 +1435,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1459,15 +1459,14 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNonNull(); { @@ -1496,6 +1495,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 20); } listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1539,11 +1539,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1563,15 +1563,14 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(1); - listHolder_0->mList[1].authMode = static_cast(2); + listHolder_0->mList[1].privilege = static_cast(1); + listHolder_0->mList[1].authMode = static_cast(2); listHolder_0->mList[1].subjects.SetNull(); listHolder_0->mList[1].targets.SetNonNull(); @@ -1682,6 +1681,7 @@ class TestAccessControlClusterSuite : public TestCommand listHolder_0->mList[1].targets.Value() = chip::app::DataModel::List(listHolder_3->mList, 20); } + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -1725,11 +1725,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -1749,11 +1749,11 @@ class TestAccessControlClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(1); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 1); @@ -1796,11 +1796,11 @@ class TestAccessControlClusterSuite : public TestCommand { auto iter_0 = acl.begin(); VerifyOrReturn(CheckNextListItemDecodes("acl", iter_0, 0)); - VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("acl[0].privilege", iter_0.GetValue().privilege, 5)); VerifyOrReturn(CheckValue("acl[0].authMode", iter_0.GetValue().authMode, 2)); VerifyOrReturn(CheckValueNull("acl[0].subjects", iter_0.GetValue().subjects)); VerifyOrReturn(CheckValueNull("acl[0].targets", iter_0.GetValue().targets)); + VerifyOrReturn(CheckValue("acl[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("acl", iter_0, 1)); } @@ -90035,8 +90035,8 @@ class TestOperationalCredentialsClusterSuite : public TestCommand { auto iter_0 = fabrics.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); - VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, ourFabricIndex)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); + VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, ourFabricIndex)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } @@ -90105,8 +90105,8 @@ class TestOperationalCredentialsClusterSuite : public TestCommand { auto iter_0 = fabrics.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); - VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, ourFabricIndex)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("Batcave", 7))); + VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, ourFabricIndex)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } @@ -90896,7 +90896,6 @@ class TestBindingSuite : public TestCommand listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; listHolder_0->mList[1].node.Emplace(); listHolder_0->mList[1].node.Value() = 1ULL; listHolder_0->mList[1].group.Emplace(); @@ -90905,6 +90904,7 @@ class TestBindingSuite : public TestCommand listHolder_0->mList[1].endpoint.Value() = 1U; listHolder_0->mList[1].cluster.Emplace(); listHolder_0->mList[1].cluster.Value() = 6UL; + listHolder_0->mList[1].fabricIndex = 0; bindingArgument = chip::app::DataModel::List(listHolder_0->mList, 2); @@ -90937,23 +90937,23 @@ class TestBindingSuite : public TestCommand auto * listHolder_0 = new ListHolder(3); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; listHolder_0->mList[0].group.Emplace(); listHolder_0->mList[0].group.Value() = 1U; + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; listHolder_0->mList[1].node.Emplace(); listHolder_0->mList[1].node.Value() = 1ULL; listHolder_0->mList[1].endpoint.Emplace(); listHolder_0->mList[1].endpoint.Value() = 1U; listHolder_0->mList[1].cluster.Emplace(); listHolder_0->mList[1].cluster.Value() = 6UL; + listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[2].fabricIndex = 0; listHolder_0->mList[2].node.Emplace(); listHolder_0->mList[2].node.Value() = 2ULL; listHolder_0->mList[2].endpoint.Emplace(); listHolder_0->mList[2].endpoint.Value() = 1U; + listHolder_0->mList[2].fabricIndex = 0; bindingArgument = chip::app::DataModel::List(listHolder_0->mList, 3); @@ -90995,23 +90995,23 @@ class TestBindingSuite : public TestCommand { auto iter_0 = binding.begin(); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 0)); - VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[0].group", iter_0.GetValue().group)); VerifyOrReturn(CheckValue("binding[0].group.Value()", iter_0.GetValue().group.Value(), 1U)); + VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 1)); - VerifyOrReturn(CheckValue("binding[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[1].node", iter_0.GetValue().node)); VerifyOrReturn(CheckValue("binding[1].node.Value()", iter_0.GetValue().node.Value(), 1ULL)); VerifyOrReturn(CheckValuePresent("binding[1].endpoint", iter_0.GetValue().endpoint)); VerifyOrReturn(CheckValue("binding[1].endpoint.Value()", iter_0.GetValue().endpoint.Value(), 1U)); VerifyOrReturn(CheckValuePresent("binding[1].cluster", iter_0.GetValue().cluster)); VerifyOrReturn(CheckValue("binding[1].cluster.Value()", iter_0.GetValue().cluster.Value(), 6UL)); + VerifyOrReturn(CheckValue("binding[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 2)); - VerifyOrReturn(CheckValue("binding[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[2].node", iter_0.GetValue().node)); VerifyOrReturn(CheckValue("binding[2].node.Value()", iter_0.GetValue().node.Value(), 2ULL)); VerifyOrReturn(CheckValuePresent("binding[2].endpoint", iter_0.GetValue().endpoint)); VerifyOrReturn(CheckValue("binding[2].endpoint.Value()", iter_0.GetValue().endpoint.Value(), 1U)); + VerifyOrReturn(CheckValue("binding[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("binding", iter_0, 3)); } @@ -91031,11 +91031,11 @@ class TestBindingSuite : public TestCommand auto * listHolder_0 = new ListHolder(1); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; listHolder_0->mList[0].node.Emplace(); listHolder_0->mList[0].node.Value() = 3ULL; listHolder_0->mList[0].endpoint.Emplace(); listHolder_0->mList[0].endpoint.Value() = 1U; + listHolder_0->mList[0].fabricIndex = 0; bindingArgument = chip::app::DataModel::List(listHolder_0->mList, 1); @@ -91077,11 +91077,11 @@ class TestBindingSuite : public TestCommand { auto iter_0 = binding.begin(); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 0)); - VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[0].node", iter_0.GetValue().node)); VerifyOrReturn(CheckValue("binding[0].node.Value()", iter_0.GetValue().node.Value(), 3ULL)); VerifyOrReturn(CheckValuePresent("binding[0].endpoint", iter_0.GetValue().endpoint)); VerifyOrReturn(CheckValue("binding[0].endpoint.Value()", iter_0.GetValue().endpoint.Value(), 1U)); + VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("binding", iter_0, 1)); } @@ -91111,23 +91111,23 @@ class TestBindingSuite : public TestCommand { auto iter_0 = binding.begin(); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 0)); - VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[0].group", iter_0.GetValue().group)); VerifyOrReturn(CheckValue("binding[0].group.Value()", iter_0.GetValue().group.Value(), 1U)); + VerifyOrReturn(CheckValue("binding[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 1)); - VerifyOrReturn(CheckValue("binding[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[1].node", iter_0.GetValue().node)); VerifyOrReturn(CheckValue("binding[1].node.Value()", iter_0.GetValue().node.Value(), 1ULL)); VerifyOrReturn(CheckValuePresent("binding[1].endpoint", iter_0.GetValue().endpoint)); VerifyOrReturn(CheckValue("binding[1].endpoint.Value()", iter_0.GetValue().endpoint.Value(), 1U)); VerifyOrReturn(CheckValuePresent("binding[1].cluster", iter_0.GetValue().cluster)); VerifyOrReturn(CheckValue("binding[1].cluster.Value()", iter_0.GetValue().cluster.Value(), 6UL)); + VerifyOrReturn(CheckValue("binding[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("binding", iter_0, 2)); - VerifyOrReturn(CheckValue("binding[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValuePresent("binding[2].node", iter_0.GetValue().node)); VerifyOrReturn(CheckValue("binding[2].node.Value()", iter_0.GetValue().node.Value(), 2ULL)); VerifyOrReturn(CheckValuePresent("binding[2].endpoint", iter_0.GetValue().endpoint)); VerifyOrReturn(CheckValue("binding[2].endpoint.Value()", iter_0.GetValue().endpoint.Value(), 1U)); + VerifyOrReturn(CheckValue("binding[2].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("binding", iter_0, 3)); } @@ -102232,13 +102232,13 @@ class TestGroupMessagingSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 1; listHolder_0->mList[0].groupId = 257U; listHolder_0->mList[0].groupKeySetID = 417U; + listHolder_0->mList[0].fabricIndex = 1; - listHolder_0->mList[1].fabricIndex = 1; listHolder_0->mList[1].groupId = 258U; listHolder_0->mList[1].groupKeySetID = 418U; + listHolder_0->mList[1].fabricIndex = 1; groupKeyMapArgument = chip::app::DataModel::List( @@ -102271,17 +102271,17 @@ class TestGroupMessagingSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[1].fabricIndex = 0; - listHolder_0->mList[1].privilege = static_cast(3); - listHolder_0->mList[1].authMode = static_cast(3); + listHolder_0->mList[1].privilege = static_cast(3); + listHolder_0->mList[1].authMode = static_cast(3); listHolder_0->mList[1].subjects.SetNull(); listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); @@ -102465,11 +102465,11 @@ class TestGroupMessagingSuite : public TestCommand auto * listHolder_0 = new ListHolder(1); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 0; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 0; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 1); @@ -103800,13 +103800,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 1; listHolder_0->mList[0].groupId = 257U; listHolder_0->mList[0].groupKeySetID = 417U; + listHolder_0->mList[0].fabricIndex = 1; - listHolder_0->mList[1].fabricIndex = 1; listHolder_0->mList[1].groupId = 258U; listHolder_0->mList[1].groupKeySetID = 418U; + listHolder_0->mList[1].fabricIndex = 1; groupKeyMapArgument = chip::app::DataModel::List( @@ -103849,13 +103849,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand { auto iter_0 = groupKeyMap.begin(); VerifyOrReturn(CheckNextListItemDecodes("groupKeyMap", iter_0, 0)); - VerifyOrReturn(CheckValue("groupKeyMap[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("groupKeyMap[0].groupId", iter_0.GetValue().groupId, 257U)); VerifyOrReturn(CheckValue("groupKeyMap[0].groupKeySetID", iter_0.GetValue().groupKeySetID, 417U)); + VerifyOrReturn(CheckValue("groupKeyMap[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("groupKeyMap", iter_0, 1)); - VerifyOrReturn(CheckValue("groupKeyMap[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("groupKeyMap[1].groupId", iter_0.GetValue().groupId, 258U)); VerifyOrReturn(CheckValue("groupKeyMap[1].groupKeySetID", iter_0.GetValue().groupKeySetID, 418U)); + VerifyOrReturn(CheckValue("groupKeyMap[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("groupKeyMap", iter_0, 2)); } @@ -103885,17 +103885,17 @@ class TestGroupKeyManagementClusterSuite : public TestCommand { auto iter_0 = groupTable.begin(); VerifyOrReturn(CheckNextListItemDecodes("groupTable", iter_0, 0)); - VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 257U)); VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName)); VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(), chip::CharSpan("Group #1", 8))); + VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNextListItemDecodes("groupTable", iter_0, 1)); - VerifyOrReturn(CheckValue("groupTable[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckValue("groupTable[1].groupId", iter_0.GetValue().groupId, 258U)); VerifyOrReturn(CheckValuePresent("groupTable[1].groupName", iter_0.GetValue().groupName)); VerifyOrReturn(CheckValueAsString("groupTable[1].groupName.Value()", iter_0.GetValue().groupName.Value(), chip::CharSpan("Group #2", 8))); + VerifyOrReturn(CheckValue("groupTable[1].fabricIndex", iter_0.GetValue().fabricIndex, 1)); VerifyOrReturn(CheckNoMoreListItems("groupTable", iter_0, 2)); } @@ -106397,9 +106397,9 @@ class TestGroupDemoConfigSuite : public TestCommand auto * listHolder_0 = new ListHolder(1); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 1; listHolder_0->mList[0].groupId = 257U; listHolder_0->mList[0].groupKeySetID = 417U; + listHolder_0->mList[0].fabricIndex = 1; groupKeyMapArgument = chip::app::DataModel::List( @@ -106432,15 +106432,14 @@ class TestGroupDemoConfigSuite : public TestCommand auto * listHolder_0 = new ListHolder(2); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricIndex = 1; - listHolder_0->mList[0].privilege = static_cast(5); - listHolder_0->mList[0].authMode = static_cast(2); + listHolder_0->mList[0].privilege = static_cast(5); + listHolder_0->mList[0].authMode = static_cast(2); listHolder_0->mList[0].subjects.SetNull(); listHolder_0->mList[0].targets.SetNull(); + listHolder_0->mList[0].fabricIndex = 1; - listHolder_0->mList[1].fabricIndex = 1; - listHolder_0->mList[1].privilege = static_cast(3); - listHolder_0->mList[1].authMode = static_cast(3); + listHolder_0->mList[1].privilege = static_cast(3); + listHolder_0->mList[1].authMode = static_cast(3); listHolder_0->mList[1].subjects.SetNonNull(); { @@ -106450,6 +106449,7 @@ class TestGroupDemoConfigSuite : public TestCommand listHolder_0->mList[1].subjects.Value() = chip::app::DataModel::List(listHolder_3->mList, 1); } listHolder_0->mList[1].targets.SetNull(); + listHolder_0->mList[1].fabricIndex = 1; aclArgument = chip::app::DataModel::List( listHolder_0->mList, 2); From 0eb2f2c4e8fab583f6c9b7266c6df75219225685 Mon Sep 17 00:00:00 2001 From: Song Guo Date: Tue, 15 Mar 2022 12:21:30 +0800 Subject: [PATCH 3/6] Misc: Adjust field order --- src/app/app-platform/ContentAppPlatform.cpp | 6 +++--- src/app/clusters/bindings/bindings.cpp | 4 ++-- .../group-key-mgmt-server/group-key-mgmt-server.cpp | 8 +++++--- src/app/tests/TestAttributeValueEncoder.cpp | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/app-platform/ContentAppPlatform.cpp b/src/app/app-platform/ContentAppPlatform.cpp index 588932dc3c83b4..c726167efd30cf 100644 --- a/src/app/app-platform/ContentAppPlatform.cpp +++ b/src/app/app-platform/ContentAppPlatform.cpp @@ -452,11 +452,11 @@ CHIP_ERROR ContentAppPlatform::ManageClientAccess(OperationalDeviceProxy * targe } bindings.push_back(Binding::Structs::TargetStruct::Type{ - .fabricIndex = kUndefinedFabricIndex, .node = MakeOptional(localNodeId), .group = NullOptional, .endpoint = MakeOptional(kLocalVideoPlayerEndpointId), .cluster = MakeOptional(kNoClusterIdSpecified), + .fabricIndex = kUndefinedFabricIndex, }); } @@ -467,11 +467,11 @@ CHIP_ERROR ContentAppPlatform::ManageClientAccess(OperationalDeviceProxy * targe ReturnErrorOnFailure(entry.AddTarget(nullptr, target)); bindings.push_back(Binding::Structs::TargetStruct::Type{ - .fabricIndex = kUndefinedFabricIndex, .node = MakeOptional(localNodeId), .group = NullOptional, .endpoint = MakeOptional(kLocalSpeakerEndpointId), .cluster = MakeOptional(kNoClusterIdSpecified), + .fabricIndex = kUndefinedFabricIndex, }); } @@ -495,11 +495,11 @@ CHIP_ERROR ContentAppPlatform::ManageClientAccess(OperationalDeviceProxy * targe ReturnErrorOnFailure(entry.AddTarget(nullptr, target)); bindings.push_back(Binding::Structs::TargetStruct::Type{ - .fabricIndex = kUndefinedFabricIndex, .node = MakeOptional(localNodeId), .group = NullOptional, .endpoint = MakeOptional(app->GetEndpointId()), .cluster = MakeOptional(kNoClusterIdSpecified), + .fabricIndex = kUndefinedFabricIndex, }); } } diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp index e54e2e68759982..c532c68cd65325 100644 --- a/src/app/clusters/bindings/bindings.cpp +++ b/src/app/clusters/bindings/bindings.cpp @@ -132,22 +132,22 @@ CHIP_ERROR BindingTableAccess::ReadBindingTable(EndpointId endpoint, AttributeVa if (entry.local == endpoint && entry.type == EMBER_UNICAST_BINDING) { Binding::Structs::TargetStruct::Type value = { - .fabricIndex = entry.fabricIndex, .node = MakeOptional(entry.nodeId), .group = NullOptional, .endpoint = MakeOptional(entry.remote), .cluster = entry.clusterId, + .fabricIndex = entry.fabricIndex, }; ReturnErrorOnFailure(subEncoder.Encode(value)); } else if (entry.local == endpoint && entry.type == EMBER_MULTICAST_BINDING) { Binding::Structs::TargetStruct::Type value = { - .fabricIndex = entry.fabricIndex, .node = NullOptional, .group = MakeOptional(entry.groupId), .endpoint = NullOptional, .cluster = entry.clusterId, + .fabricIndex = entry.fabricIndex, }; ReturnErrorOnFailure(subEncoder.Encode(value)); } diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp index ddc6891a526e9e..35bb53403295ef 100644 --- a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp +++ b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp @@ -166,9 +166,11 @@ class GroupKeyManagementAttributeAccess : public AttributeAccessInterface GroupDataProvider::GroupKey mapping; while (iter->Next(mapping)) { - GroupKeyManagement::Structs::GroupKeyMapStruct::Type key = { .fabricIndex = fabric_index, - .groupId = mapping.group_id, - .groupKeySetID = mapping.keyset_id }; + GroupKeyManagement::Structs::GroupKeyMapStruct::Type key = { + .groupId = mapping.group_id, + .groupKeySetID = mapping.keyset_id, + .fabricIndex = fabric_index, + }; encoder.Encode(key); } iter->Release(); diff --git a/src/app/tests/TestAttributeValueEncoder.cpp b/src/app/tests/TestAttributeValueEncoder.cpp index 4363582c29cb2a..e063e0e888ac0e 100644 --- a/src/app/tests/TestAttributeValueEncoder.cpp +++ b/src/app/tests/TestAttributeValueEncoder.cpp @@ -294,8 +294,8 @@ void TestEncodeFabricScoped(nlTestSuite * aSuite, void * aContext) 0x34, 0x05, // Tag (05) Null 0x18, // End of container (attribute path) 0x35, 0x02, // Tag 02 (attribute data) - 0x24, 0x00, 0x01, // Tag 0, UINT8 Value 1 (fabric index) 0x30, 0x01, 0x00, // Tag 1, OCTET_STRING length 0 (data) + 0x24, 0xFE, 0x01, // Tag 0xFE, UINT8 Value 1 (fabric index) 0x18, 0x18, 0x18, From 1892c8409c210dcb553e8b1e83e387d6cf4749b6 Mon Sep 17 00:00:00 2001 From: Song Guo Date: Wed, 16 Mar 2022 16:43:36 +0800 Subject: [PATCH 4/6] Fix missing structs --- .../data-model/chip/access-control-cluster.xml | 4 ++-- .../zcl/data-model/chip/test-cluster.xml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml index 66dfdbaddbacee..8132833cfe25c8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml @@ -88,19 +88,19 @@ limitations under the License. The cluster SHALL send AccessControlEntryChanged events whenever its ACL attribute data is changed by an Administrator. - + The cluster SHALL send AccessControlExtensionChanged events whenever its extension attribute data is changed by an Administrator. - + 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 index c14f1cb877411a..b5649c56da6d2a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml @@ -24,14 +24,14 @@ limitations under the License. - - - - - - - - + + + + + + + + @@ -577,7 +577,7 @@ limitations under the License. Example test event - + From 9afbb53ebdce1d19ae21ad556eb366a7dbb70c2a Mon Sep 17 00:00:00 2001 From: Song Guo Date: Wed, 16 Mar 2022 16:54:33 +0800 Subject: [PATCH 5/6] Run Codegen --- .../all-clusters-app.matter | 8 ++-- .../bridge-common/bridge-app.matter | 8 ++-- .../door-lock-common/door-lock-app.matter | 4 +- .../light-switch-app.matter | 4 +- .../lighting-common/lighting-app.matter | 4 +- examples/lock-app/lock-common/lock-app.matter | 4 +- .../log-source-common/log-source-app.matter | 4 +- .../ota-provider-app.matter | 8 ++-- .../ota-requestor-app.matter | 4 +- examples/pump-app/pump-common/pump-app.matter | 4 +- .../pump-controller-app.matter | 4 +- .../esp32/main/temperature-measurement.matter | 4 +- .../thermostat-common/thermostat.matter | 4 +- examples/tv-app/tv-common/tv-app.matter | 4 +- .../tv-casting-common/tv-casting-app.matter | 6 +-- examples/window-app/common/window-app.matter | 4 +- .../data_model/controller-clusters.matter | 8 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 27 +++++------ .../zap-generated/CHIPClustersWrite-JNI.cpp | 12 ++--- .../java/zap-generated/CHIPReadCallbacks.cpp | 26 +++++----- .../chip/devicecontroller/ChipStructs.java | 14 +++--- .../python/chip/clusters/Objects.py | 14 +++--- .../CHIPAttributeTLVValueDecoder.mm | 2 +- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 2 +- .../CHIP/zap-generated/CHIPClustersObjc.mm | 2 +- .../CHIP/zap-generated/CHIPStructsObjc.h | 2 +- .../CHIP/zap-generated/CHIPStructsObjc.mm | 4 +- .../app-common/zap-generated/af-structs.h | 2 +- .../zap-generated/cluster-objects.cpp | 30 ++++++------ .../zap-generated/cluster-objects.h | 24 +++++----- .../cluster/ComplexArgumentParser.cpp | 12 ++--- .../cluster/logging/DataModelLogger.cpp | 48 +++++++++---------- 32 files changed, 153 insertions(+), 154 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 index d5c7d7c318b73b..84013a1e9ca489 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; @@ -2881,7 +2881,6 @@ server cluster TestCluster = 1295 { } struct TestFabricScoped { - fabric_idx fabricIndex = 0; INT8U fabricSensitiveInt8u = 1; optional INT8U optionalFabricSensitiveInt8u = 2; nullable INT8U nullableFabricSensitiveInt8u = 3; @@ -2889,6 +2888,7 @@ server cluster TestCluster = 1295 { CHAR_STRING fabricSensitiveCharString = 5; SimpleStruct fabricSensitiveStruct = 6; INT8U fabricSensitiveInt8uList[] = 7; + fabric_idx fabricIndex = 254; } struct NestedStructList { @@ -2917,7 +2917,7 @@ server cluster TestCluster = 1295 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 1; + fabric_idx arg1 = 254; } attribute boolean boolean = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 9d2f03cbdc5076..097b604c564f99 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -47,19 +47,19 @@ client cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; @@ -109,19 +109,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter index 1ac8a6354e22e2..e477b81667bdab 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.matter +++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index af5a7358f7f587..dc41ec7b1a2417 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index dacb8827dbfc18..c8ae34b64befca 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 9ef451290e6994..2bf1813fef2ddb 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 2bffbbb90b7f56..47f00086b6a32e 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -42,19 +42,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index f4101f7659cb48..ee4f44c3c02043 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -47,19 +47,19 @@ client cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; @@ -109,19 +109,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 9cf211042deb55..74d69916fafaca 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index ded9177e08b4b4..50371acb5cb5b1 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index fc4b7c55e07ae7..137685388f093f 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 94b5da4216cd63..6b01d8725d68dd 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 00acb200b95451..732fe2dd2c02de 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 97d16520054e40..6a970795f21c2e 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; 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 index 19e7f22ea24cb6..a53c8f0badaabd 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; @@ -2600,7 +2600,7 @@ server cluster TestCluster = 1295 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 1; + fabric_idx arg1 = 254; } attribute boolean boolean = 0; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index bac22903dd89ed..5456c1c3a93ea5 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -47,19 +47,19 @@ server cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 517a7840b7765e..65ea630752be05 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -47,19 +47,19 @@ client cluster AccessControl = 31 { } info event AccessControlEntryChanged = 0 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable AccessControlEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } info event AccessControlExtensionChanged = 1 { - fabric_idx adminFabricIndex = 0; nullable node_id adminNodeID = 1; nullable INT16U adminPasscodeID = 2; ChangeTypeEnum changeType = 3; nullable ExtensionEntry latestValue = 4; + fabric_idx adminFabricIndex = 254; } attribute AccessControlEntry acl[] = 0; @@ -3344,7 +3344,6 @@ client cluster TestCluster = 1295 { } struct TestFabricScoped { - fabric_idx fabricIndex = 0; INT8U fabricSensitiveInt8u = 1; optional INT8U optionalFabricSensitiveInt8u = 2; nullable INT8U nullableFabricSensitiveInt8u = 3; @@ -3352,6 +3351,7 @@ client cluster TestCluster = 1295 { CHAR_STRING fabricSensitiveCharString = 5; SimpleStruct fabricSensitiveStruct = 6; INT8U fabricSensitiveInt8uList[] = 7; + fabric_idx fabricIndex = 254; } struct NestedStructList { @@ -3380,7 +3380,7 @@ client cluster TestCluster = 1295 { } info event TestFabricScopedEvent = 2 { - fabric_idx arg1 = 1; + fabric_idx arg1 = 254; } attribute boolean boolean = 0; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index dd77641b7f4e29..37c698edbfc041 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -12756,12 +12756,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_fabricSensitiveInt8u; std::string newElement_0_fabricSensitiveInt8uClassName = "java/lang/Integer"; std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V"; @@ -12920,6 +12914,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR newElement_NaNClassName.c_str(), newElement_NaNCtorSignature.c_str(), entry_NaN, newElement_NaN); chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_NaN); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass testFabricScopedStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -12931,20 +12931,19 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } jmethodID testFabricScopedStructCtor = env->GetMethodID( testFabricScopedStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/" - "String;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;)V"); + "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/" + "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); if (testFabricScopedStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor"); return nullptr; } - newElement_0 = - env->NewObject(testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricIndex, - newElement_0_fabricSensitiveInt8u, newElement_0_optionalFabricSensitiveInt8u, - newElement_0_nullableFabricSensitiveInt8u, newElement_0_nullableOptionalFabricSensitiveInt8u, - newElement_0_fabricSensitiveCharString, newElement_0_fabricSensitiveStruct, - newElement_0_fabricSensitiveInt8uList); + newElement_0 = env->NewObject( + testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u, + newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u, + newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString, + newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 6bf8f692fc7e02..ec99d550be3f33 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -5934,12 +5934,6 @@ JNI_METHOD(void, TestClusterCluster, writeListFabricScopedAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); - jobject element_0_fabricIndexItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", - element_0_fabricIndexItem_1); - listHolder_0->mList[i_0].fabricIndex = - static_castmList[i_0].fabricIndex)>>( - chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); jobject element_0_fabricSensitiveInt8uItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricSensitiveInt8u", "Ljava/lang/Integer;", element_0_fabricSensitiveInt8uItem_1); @@ -6086,6 +6080,12 @@ JNI_METHOD(void, TestClusterCluster, writeListFabricScopedAttribute) listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2(); } } + jobject element_0_fabricIndexItem_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricIndex", "Ljava/lang/Integer;", + element_0_fabricIndexItem_1); + listHolder_0->mList[i_0].fabricIndex = + static_castmList[i_0].fabricIndex)>>( + chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_fabricIndexItem_1)); } cppValue = ListType_0(listHolder_0->mList, valueSize); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 3b9a064bbfa057..b0179879605a71 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -18128,12 +18128,6 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricIndex; - std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; - std::string newElement_0_fabricIndexCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), - newElement_0_fabricIndexCtorSignature.c_str(), - entry_0.fabricIndex, newElement_0_fabricIndex); jobject newElement_0_fabricSensitiveInt8u; std::string newElement_0_fabricSensitiveInt8uClassName = "java/lang/Integer"; std::string newElement_0_fabricSensitiveInt8uCtorSignature = "(I)V"; @@ -18283,6 +18277,12 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn( newElement_NaNClassName.c_str(), newElement_NaNCtorSignature.c_str(), entry_NaN, newElement_NaN); chip::JniReferences::GetInstance().AddToList(newElement_0_fabricSensitiveInt8uList, newElement_NaN); } + jobject newElement_0_fabricIndex; + std::string newElement_0_fabricIndexClassName = "java/lang/Integer"; + std::string newElement_0_fabricIndexCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIndexClassName.c_str(), + newElement_0_fabricIndexCtorSignature.c_str(), + entry_0.fabricIndex, newElement_0_fabricIndex); jclass testFabricScopedStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -18294,19 +18294,19 @@ void CHIPTestClusterListFabricScopedAttributeCallback::CallbackFn( } jmethodID testFabricScopedStructCtor = env->GetMethodID( testFabricScopedStructClass, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/" - "String;Lchip/devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;)V"); + "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;Ljava/lang/String;Lchip/" + "devicecontroller/ChipStructs$TestClusterClusterSimpleStruct;Ljava/util/ArrayList;Ljava/lang/Integer;)V"); if (testFabricScopedStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$TestClusterClusterTestFabricScoped constructor"); return; } - newElement_0 = env->NewObject(testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricIndex, - newElement_0_fabricSensitiveInt8u, newElement_0_optionalFabricSensitiveInt8u, - newElement_0_nullableFabricSensitiveInt8u, newElement_0_nullableOptionalFabricSensitiveInt8u, - newElement_0_fabricSensitiveCharString, newElement_0_fabricSensitiveStruct, - newElement_0_fabricSensitiveInt8uList); + newElement_0 = + env->NewObject(testFabricScopedStructClass, testFabricScopedStructCtor, newElement_0_fabricSensitiveInt8u, + newElement_0_optionalFabricSensitiveInt8u, newElement_0_nullableFabricSensitiveInt8u, + newElement_0_nullableOptionalFabricSensitiveInt8u, newElement_0_fabricSensitiveCharString, + newElement_0_fabricSensitiveStruct, newElement_0_fabricSensitiveInt8uList, newElement_0_fabricIndex); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 6617ed7640e91e..67be474ef5dc1d 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1518,7 +1518,6 @@ public String toString() { } public static class TestClusterClusterTestFabricScoped { - public Integer fabricIndex; public Integer fabricSensitiveInt8u; public Optional optionalFabricSensitiveInt8u; public @Nullable Integer nullableFabricSensitiveInt8u; @@ -1526,17 +1525,17 @@ public static class TestClusterClusterTestFabricScoped { public String fabricSensitiveCharString; public ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct; public ArrayList fabricSensitiveInt8uList; + public Integer fabricIndex; public TestClusterClusterTestFabricScoped( - Integer fabricIndex, Integer fabricSensitiveInt8u, Optional optionalFabricSensitiveInt8u, @Nullable Integer nullableFabricSensitiveInt8u, @Nullable Optional nullableOptionalFabricSensitiveInt8u, String fabricSensitiveCharString, ChipStructs.TestClusterClusterSimpleStruct fabricSensitiveStruct, - ArrayList fabricSensitiveInt8uList) { - this.fabricIndex = fabricIndex; + ArrayList fabricSensitiveInt8uList, + Integer fabricIndex) { this.fabricSensitiveInt8u = fabricSensitiveInt8u; this.optionalFabricSensitiveInt8u = optionalFabricSensitiveInt8u; this.nullableFabricSensitiveInt8u = nullableFabricSensitiveInt8u; @@ -1544,15 +1543,13 @@ public TestClusterClusterTestFabricScoped( this.fabricSensitiveCharString = fabricSensitiveCharString; this.fabricSensitiveStruct = fabricSensitiveStruct; this.fabricSensitiveInt8uList = fabricSensitiveInt8uList; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("TestClusterClusterTestFabricScoped {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tfabricSensitiveInt8u: "); output.append(fabricSensitiveInt8u); output.append("\n"); @@ -1574,6 +1571,9 @@ public String toString() { output.append("\tfabricSensitiveInt8uList: "); output.append(fabricSensitiveInt8uList); output.append("\n"); + output.append("\tfabricIndex: "); + output.append(fabricIndex); + output.append("\n"); output.append("}\n"); return output.toString(); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 085177c393e31c..9acdf507cc1d20 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -5904,18 +5904,18 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="adminNodeID", Tag=1, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="adminPasscodeID", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="changeType", Tag=3, Type=AccessControl.Enums.ChangeTypeEnum), ClusterObjectFieldDescriptor(Label="latestValue", Tag=4, Type=typing.Union[Nullable, AccessControl.Structs.AccessControlEntry]), + ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=254, Type=uint), ]) - adminFabricIndex: 'uint' = 0 adminNodeID: 'typing.Union[Nullable, uint]' = NullValue adminPasscodeID: 'typing.Union[Nullable, uint]' = NullValue changeType: 'AccessControl.Enums.ChangeTypeEnum' = 0 latestValue: 'typing.Union[Nullable, AccessControl.Structs.AccessControlEntry]' = NullValue + adminFabricIndex: 'uint' = 0 @dataclass class AccessControlExtensionChanged(ClusterEvent): @@ -5931,18 +5931,18 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="adminNodeID", Tag=1, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="adminPasscodeID", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="changeType", Tag=3, Type=AccessControl.Enums.ChangeTypeEnum), ClusterObjectFieldDescriptor(Label="latestValue", Tag=4, Type=typing.Union[Nullable, AccessControl.Structs.ExtensionEntry]), + ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=254, Type=uint), ]) - adminFabricIndex: 'uint' = 0 adminNodeID: 'typing.Union[Nullable, uint]' = NullValue adminPasscodeID: 'typing.Union[Nullable, uint]' = NullValue changeType: 'AccessControl.Enums.ChangeTypeEnum' = 0 latestValue: 'typing.Union[Nullable, AccessControl.Structs.ExtensionEntry]' = NullValue + adminFabricIndex: 'uint' = 0 @dataclass @@ -34244,7 +34244,6 @@ class TestFabricScoped(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8u", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="optionalFabricSensitiveInt8u", Tag=2, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="nullableFabricSensitiveInt8u", Tag=3, Type=typing.Union[Nullable, uint]), @@ -34252,9 +34251,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="fabricSensitiveCharString", Tag=5, Type=str), ClusterObjectFieldDescriptor(Label="fabricSensitiveStruct", Tag=6, Type=TestCluster.Structs.SimpleStruct), ClusterObjectFieldDescriptor(Label="fabricSensitiveInt8uList", Tag=7, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 fabricSensitiveInt8u: 'uint' = 0 optionalFabricSensitiveInt8u: 'typing.Optional[uint]' = None nullableFabricSensitiveInt8u: 'typing.Union[Nullable, uint]' = NullValue @@ -34262,6 +34261,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: fabricSensitiveCharString: 'str' = "" fabricSensitiveStruct: 'TestCluster.Structs.SimpleStruct' = field(default_factory=lambda: TestCluster.Structs.SimpleStruct()) fabricSensitiveInt8uList: 'typing.List[uint]' = field(default_factory=lambda: []) + fabricIndex: 'uint' = 0 @dataclass class NullablesAndOptionalsStruct(ClusterObject): @@ -36404,7 +36404,7 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="arg1", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="arg1", Tag=254, Type=uint), ]) arg1: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 05e2497f9b13b8..707dd0c2c04537 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -10325,7 +10325,6 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPTestClusterClusterTestFabricScoped * newElement_0; newElement_0 = [CHIPTestClusterClusterTestFabricScoped new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u]; if (entry_0.optionalFabricSensitiveInt8u.HasValue()) { newElement_0.optionalFabricSensitiveInt8u = @@ -10382,6 +10381,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader } newElement_0.fabricSensitiveInt8uList = array_2; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 9a70ddbbdbd426..69c4a6a920b465 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -9024,7 +9024,6 @@ auto & entry_0 = iter_0.GetValue(); CHIPTestClusterClusterTestFabricScoped * newElement_0; newElement_0 = [CHIPTestClusterClusterTestFabricScoped new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.fabricSensitiveInt8u = [NSNumber numberWithUnsignedChar:entry_0.fabricSensitiveInt8u]; if (entry_0.optionalFabricSensitiveInt8u.HasValue()) { newElement_0.optionalFabricSensitiveInt8u = @@ -9080,6 +9079,7 @@ } newElement_0.fabricSensitiveInt8uList = array_2; } + newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index f434ea0fa1e8c0..2571da558e2441 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -39964,7 +39964,6 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPTestClusterClusterTestFabricScoped *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].fabricSensitiveInt8u = element_0.fabricSensitiveInt8u.unsignedCharValue; if (element_0.optionalFabricSensitiveInt8u != nil) { auto & definedValue_2 = listHolder_0->mList[i_0].optionalFabricSensitiveInt8u.Emplace(); @@ -40021,6 +40020,7 @@ new CHIPDefaultSuccessCallbackBridge( listHolder_0->mList[i_0].fabricSensitiveInt8uList = ListType_2(); } } + listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; } cppValue = ListType_0(listHolder_0->mList, value.count); } else { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index 44dab81193894c..d3a758250b858d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -448,7 +448,6 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPTestClusterClusterTestFabricScoped : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nonnull fabricSensitiveInt8u; @property (strong, nonatomic) NSNumber * _Nullable optionalFabricSensitiveInt8u; @property (strong, nonatomic) NSNumber * _Nullable nullableFabricSensitiveInt8u; @@ -456,6 +455,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) NSString * _Nonnull fabricSensitiveCharString; @property (strong, nonatomic) CHIPTestClusterClusterSimpleStruct * _Nonnull fabricSensitiveStruct; @property (strong, nonatomic) NSArray * _Nonnull fabricSensitiveInt8uList; +@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; - (instancetype)init; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 8da6ab5beb6ae0..28257d240eb56e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -925,8 +925,6 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _fabricSensitiveInt8u = @(0); _optionalFabricSensitiveInt8u = nil; @@ -940,6 +938,8 @@ - (instancetype)init _fabricSensitiveStruct = [CHIPTestClusterClusterSimpleStruct new]; _fabricSensitiveInt8uList = [NSArray array]; + + _fabricIndex = @(0); } return self; } 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 index b3080ac3d3d71d..fa90936d96ad5f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -44,7 +44,6 @@ typedef struct _SimpleStruct // Struct for TestFabricScoped typedef struct _TestFabricScoped { - chip::FabricIndex fabricIndex; uint8_t fabricSensitiveInt8u; uint8_t optionalFabricSensitiveInt8u; uint8_t nullableFabricSensitiveInt8u; @@ -52,6 +51,7 @@ typedef struct _TestFabricScoped chip::CharSpan fabricSensitiveCharString; SimpleStruct fabricSensitiveStruct; /* TYPE WARNING: array array defaults to */ uint8_t * fabricSensitiveInt8uList; + chip::FabricIndex fabricIndex; } TestFabricScoped; // Struct for Dimension 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 index d5ec9f7b32ddb6..3e3dc6523a7721 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -4769,12 +4769,12 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminNodeID)), adminNodeID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminPasscodeID)), adminPasscodeID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kChangeType)), changeType)); ReturnErrorOnFailure( DataModel::EncodeForRead(writer, TLV::ContextTag(to_underlying(Fields::kLatestValue)), GetFabricIndex(), latestValue)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -4790,9 +4790,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kAdminFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); - break; case to_underlying(Fields::kAdminNodeID): ReturnErrorOnFailure(DataModel::Decode(reader, adminNodeID)); break; @@ -4805,6 +4802,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLatestValue): ReturnErrorOnFailure(DataModel::Decode(reader, latestValue)); break; + case to_underlying(Fields::kAdminFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); + break; default: break; } @@ -4820,12 +4820,12 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminNodeID)), adminNodeID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminPasscodeID)), adminPasscodeID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kChangeType)), changeType)); ReturnErrorOnFailure( DataModel::EncodeForRead(writer, TLV::ContextTag(to_underlying(Fields::kLatestValue)), GetFabricIndex(), latestValue)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAdminFabricIndex)), adminFabricIndex)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -4841,9 +4841,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kAdminFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); - break; case to_underlying(Fields::kAdminNodeID): ReturnErrorOnFailure(DataModel::Decode(reader, adminNodeID)); break; @@ -4856,6 +4853,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kLatestValue): ReturnErrorOnFailure(DataModel::Decode(reader, latestValue)); break; + case to_underlying(Fields::kAdminFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, adminFabricIndex)); + break; default: break; } @@ -22715,10 +22715,6 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< bool includeSensitive = !accessingFabricIndex.HasValue() || (accessingFabricIndex.Value() == fabricIndex); TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - if (accessingFabricIndex.HasValue()) - { - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); - } if (includeSensitive) { ReturnErrorOnFailure( @@ -22755,6 +22751,10 @@ CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional< ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricSensitiveInt8uList)), fabricSensitiveInt8uList)); } + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -22771,9 +22771,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); - break; case to_underlying(Fields::kFabricSensitiveInt8u): ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8u)); break; @@ -22795,6 +22792,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kFabricSensitiveInt8uList): ReturnErrorOnFailure(DataModel::Decode(reader, fabricSensitiveInt8uList)); break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; default: break; } 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 index 2b8f73dc6bdc80..ad01eb7802c2f5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -6840,11 +6840,11 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kAdminFabricIndex = 0, kAdminNodeID = 1, kAdminPasscodeID = 2, kChangeType = 3, kLatestValue = 4, + kAdminFabricIndex = 254, }; struct Type @@ -6855,11 +6855,11 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; } static constexpr bool kIsFabricScoped = true; - chip::FabricIndex adminFabricIndex = static_cast(0); DataModel::Nullable adminNodeID; DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; + chip::FabricIndex adminFabricIndex = static_cast(0); auto GetFabricIndex() const { return adminFabricIndex; } @@ -6873,11 +6873,11 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::AccessControlEntryChanged::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; } - chip::FabricIndex adminFabricIndex = static_cast(0); DataModel::Nullable adminNodeID; DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; + chip::FabricIndex adminFabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -6887,11 +6887,11 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kAdminFabricIndex = 0, kAdminNodeID = 1, kAdminPasscodeID = 2, kChangeType = 3, kLatestValue = 4, + kAdminFabricIndex = 254, }; struct Type @@ -6902,11 +6902,11 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; } static constexpr bool kIsFabricScoped = true; - chip::FabricIndex adminFabricIndex = static_cast(0); DataModel::Nullable adminNodeID; DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; + chip::FabricIndex adminFabricIndex = static_cast(0); auto GetFabricIndex() const { return adminFabricIndex; } @@ -6920,11 +6920,11 @@ struct DecodableType static constexpr EventId GetEventId() { return Events::AccessControlExtensionChanged::Id; } static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; } - chip::FabricIndex adminFabricIndex = static_cast(0); DataModel::Nullable adminNodeID; DataModel::Nullable adminPasscodeID; ChangeTypeEnum changeType = static_cast(0); DataModel::Nullable latestValue; + chip::FabricIndex adminFabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -35049,7 +35049,6 @@ using DecodableType = Type; namespace TestFabricScoped { enum class Fields { - kFabricIndex = 0, kFabricSensitiveInt8u = 1, kOptionalFabricSensitiveInt8u = 2, kNullableFabricSensitiveInt8u = 3, @@ -35057,19 +35056,20 @@ enum class Fields kFabricSensitiveCharString = 5, kFabricSensitiveStruct = 6, kFabricSensitiveInt8uList = 7, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); - uint8_t fabricSensitiveInt8u = static_cast(0); + uint8_t fabricSensitiveInt8u = static_cast(0); Optional optionalFabricSensitiveInt8u; DataModel::Nullable nullableFabricSensitiveInt8u; Optional> nullableOptionalFabricSensitiveInt8u; chip::CharSpan fabricSensitiveCharString; Structs::SimpleStruct::Type fabricSensitiveStruct; DataModel::List fabricSensitiveInt8uList; + chip::FabricIndex fabricIndex = static_cast(0); static constexpr bool kIsFabricScoped = true; @@ -35087,14 +35087,14 @@ struct Type struct DecodableType { public: - chip::FabricIndex fabricIndex = static_cast(0); - uint8_t fabricSensitiveInt8u = static_cast(0); + uint8_t fabricSensitiveInt8u = static_cast(0); Optional optionalFabricSensitiveInt8u; DataModel::Nullable nullableFabricSensitiveInt8u; Optional> nullableOptionalFabricSensitiveInt8u; chip::CharSpan fabricSensitiveCharString; Structs::SimpleStruct::DecodableType fabricSensitiveStruct; DataModel::DecodableList fabricSensitiveInt8uList; + chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -37909,7 +37909,7 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields { - kArg1 = 1, + kArg1 = 254, }; struct Type diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 9a1763681ae755..3236459f7962e0 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1934,8 +1934,6 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("TestFabricScoped.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TestFabricScoped.fabricSensitiveInt8u", "fabricSensitiveInt8u", value.isMember("fabricSensitiveInt8u"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TestFabricScoped.nullableFabricSensitiveInt8u", @@ -1947,11 +1945,10 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, value.isMember("fabricSensitiveStruct"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist( "TestFabricScoped.fabricSensitiveInt8uList", "fabricSensitiveInt8uList", value.isMember("fabricSensitiveInt8uList"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("TestFabricScoped.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricSensitiveInt8u"); ReturnErrorOnFailure( ComplexArgumentParser::Setup(labelWithMember, request.fabricSensitiveInt8u, value["fabricSensitiveInt8u"])); @@ -1986,12 +1983,14 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure( ComplexArgumentParser::Setup(labelWithMember, request.fabricSensitiveInt8uList, value["fabricSensitiveInt8uList"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::TestCluster::Structs::TestFabricScoped::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.fabricSensitiveInt8u); ComplexArgumentParser::Finalize(request.optionalFabricSensitiveInt8u); ComplexArgumentParser::Finalize(request.nullableFabricSensitiveInt8u); @@ -1999,6 +1998,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::TestCluster::Structs:: ComplexArgumentParser::Finalize(request.fabricSensitiveCharString); ComplexArgumentParser::Finalize(request.fabricSensitiveStruct); ComplexArgumentParser::Finalize(request.fabricSensitiveInt8uList); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type & request, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 07a85e878626d3..73fe9d57e1d5f2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -2089,14 +2089,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); - return err; - } - } { CHIP_ERROR err = LogValue("FabricSensitiveInt8u", indent + 1, value.fabricSensitiveInt8u); if (err != CHIP_NO_ERROR) @@ -2154,6 +2146,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -2445,14 +2445,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const AccessControl::Events::AccessControlEntryChanged::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = DataModelLogger::LogValue("AdminFabricIndex", indent + 1, value.adminFabricIndex); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminFabricIndex'"); - return err; - } - } { CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID); if (err != CHIP_NO_ERROR) @@ -2485,14 +2477,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } - DataModelLogger::LogString(indent, "}"); - - return CHIP_NO_ERROR; -} -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const AccessControl::Events::AccessControlExtensionChanged::DecodableType & value) -{ - DataModelLogger::LogString(label, indent, "{"); { CHIP_ERROR err = DataModelLogger::LogValue("AdminFabricIndex", indent + 1, value.adminFabricIndex); if (err != CHIP_NO_ERROR) @@ -2501,6 +2485,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const AccessControl::Events::AccessControlExtensionChanged::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); { CHIP_ERROR err = DataModelLogger::LogValue("AdminNodeID", indent + 1, value.adminNodeID); if (err != CHIP_NO_ERROR) @@ -2533,6 +2525,14 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } + { + CHIP_ERROR err = DataModelLogger::LogValue("AdminFabricIndex", indent + 1, value.adminFabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'AdminFabricIndex'"); + return err; + } + } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; From 10322ca0f5d96926b3d115990114e9e5001d168b Mon Sep 17 00:00:00 2001 From: Song Guo Date: Wed, 16 Mar 2022 17:05:30 +0800 Subject: [PATCH 6/6] Fix Code --- .../clusters/access-control-server/access-control-server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp index e97f93f5234ffc..19b17d4406093f 100644 --- a/src/app/clusters/access-control-server/access-control-server.cpp +++ b/src/app/clusters/access-control-server/access-control-server.cpp @@ -429,8 +429,8 @@ CHIP_ERROR LogEntryChangedEvent(const AccessControl::Entry & entry, const Access adminPasscodeID.SetNonNull(PAKEKeyIdFromNodeId(subjectDescriptor.subject)); } - AccessControlCluster::Events::AccessControlEntryChanged::Type event{ subjectDescriptor.fabricIndex, adminNodeID, - adminPasscodeID, changeType, latestValue }; + AccessControlCluster::Events::AccessControlEntryChanged::Type event{ adminNodeID, adminPasscodeID, changeType, latestValue, + subjectDescriptor.fabricIndex }; err = LogEvent(event, 0, eventNumber); if (CHIP_NO_ERROR != err)