From 4a60bf8781c0616881c7a6ce14d3769a081afe83 Mon Sep 17 00:00:00 2001 From: Mathieu Kardous Date: Wed, 19 Jul 2023 15:53:03 -0400 Subject: [PATCH] generated files --- .../all-clusters-common/all-clusters-app.matter | 2 +- .../silabs/data_model/lighting-thread-app.matter | 2 +- .../smoke-co-alarm-common/smoke-co-alarm-app.matter | 2 +- src/controller/data_model/controller-clusters.matter | 2 +- .../java/chip/devicecontroller/ClusterIDMapping.java | 2 +- .../chip/devicecontroller/ChipClusters.java | 10 +++++----- .../chip/devicecontroller/ClusterInfoMapping.java | 6 +++--- src/controller/python/chip/clusters/CHIPClusters.py | 2 +- src/controller/python/chip/clusters/Objects.py | 4 ++-- .../app-common/zap-generated/cluster-objects.cpp | 6 +++--- .../app-common/zap-generated/cluster-objects.h | 8 ++++---- .../chip-tool/zap-generated/cluster/Commands.h | 2 +- zzz_generated/chip-tool/zap-generated/test/Commands.h | 4 ++-- 13 files changed, 26 insertions(+), 26 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 ae43361517c1c6..160f89c6f4fd2e 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 @@ -2442,7 +2442,7 @@ server cluster IcdManagement = 70 { request struct UnregisterClientRequest { node_id checkInNodeID = 0; - optional OCTET_STRING<16> key = 1; + optional OCTET_STRING<16> verificationKey = 1; } response struct RegisterClientResponse = 1 { diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index de8055dd495f05..b8a03abc33f462 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1948,7 +1948,7 @@ server cluster IcdManagement = 70 { request struct UnregisterClientRequest { node_id checkInNodeID = 0; - optional OCTET_STRING<16> key = 1; + optional OCTET_STRING<16> verificationKey = 1; } response struct RegisterClientResponse = 1 { diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 26db9451812a0f..b2876f60992da7 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -1596,7 +1596,7 @@ server cluster IcdManagement = 70 { request struct UnregisterClientRequest { node_id checkInNodeID = 0; - optional OCTET_STRING<16> key = 1; + optional OCTET_STRING<16> verificationKey = 1; } response struct RegisterClientResponse = 1 { diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 4ce2bd85ece43d..649b7f600f6db5 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2750,7 +2750,7 @@ client cluster IcdManagement = 70 { request struct UnregisterClientRequest { node_id checkInNodeID = 0; - optional OCTET_STRING<16> key = 1; + optional OCTET_STRING<16> verificationKey = 1; } /** Register a client to the end device */ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 152df216a22292..33424cb53e0351 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -6150,7 +6150,7 @@ public static RegisterClientCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum UnregisterClientCommandField {CheckInNodeID(0),Key(1),; + }public enum UnregisterClientCommandField {CheckInNodeID(0),VerificationKey(1),; private final int id; UnregisterClientCommandField(int id) { this.id = id; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index b12d5d9f86e5c3..120a36eff84e2a 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -13197,14 +13197,14 @@ public void registerClient(RegisterClientResponseCallback callback } public void unregisterClient(DefaultClusterCallback callback - , Long checkInNodeID, Optional key) { - unregisterClient(chipClusterPtr, callback, checkInNodeID, key, null); + , Long checkInNodeID, Optional verificationKey) { + unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, null); } public void unregisterClient(DefaultClusterCallback callback - , Long checkInNodeID, Optional key + , Long checkInNodeID, Optional verificationKey , int timedInvokeTimeoutMs) { - unregisterClient(chipClusterPtr, callback, checkInNodeID, key, timedInvokeTimeoutMs); + unregisterClient(chipClusterPtr, callback, checkInNodeID, verificationKey, timedInvokeTimeoutMs); } public void stayActiveRequest(DefaultClusterCallback callback @@ -13221,7 +13221,7 @@ private native void registerClient(long chipClusterPtr, RegisterClientResponseCa , Long checkInNodeID, Long monitoredSubject, byte[] key, Optional verificationKey , @Nullable Integer timedInvokeTimeoutMs); private native void unregisterClient(long chipClusterPtr, DefaultClusterCallback Callback - , Long checkInNodeID, Optional key + , Long checkInNodeID, Optional verificationKey , @Nullable Integer timedInvokeTimeoutMs); private native void stayActiveRequest(long chipClusterPtr, DefaultClusterCallback Callback diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index d4ad7a16fc5b2d..17e7b75c4e484c 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -23215,8 +23215,8 @@ public Map> getCommandMap() { CommandParameterInfo icdManagementunregisterClientcheckInNodeIDCommandParameterInfo = new CommandParameterInfo("checkInNodeID", Long.class, Long.class); icdManagementunregisterClientCommandParams.put("checkInNodeID",icdManagementunregisterClientcheckInNodeIDCommandParameterInfo); - CommandParameterInfo icdManagementunregisterClientkeyCommandParameterInfo = new CommandParameterInfo("key", Optional.class, byte[].class); - icdManagementunregisterClientCommandParams.put("key",icdManagementunregisterClientkeyCommandParameterInfo); + CommandParameterInfo icdManagementunregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class); + icdManagementunregisterClientCommandParams.put("verificationKey",icdManagementunregisterClientverificationKeyCommandParameterInfo); InteractionInfo icdManagementunregisterClientInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { @@ -23225,7 +23225,7 @@ public Map> getCommandMap() { , (Long) commandArguments.get("checkInNodeID") , (Optional) - commandArguments.get("key") + commandArguments.get("verificationKey") ); }, diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 8346243254abab..4f42dad819ca5e 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -4183,7 +4183,7 @@ class ChipClusters: "commandName": "UnregisterClient", "args": { "checkInNodeID": "int", - "key": "bytes", + "verificationKey": "bytes", }, }, 0x00000003: { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index a2d82c1d340f34..9c9f64f05d7ba8 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -14648,11 +14648,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="checkInNodeID", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="key", Tag=1, Type=typing.Optional[bytes]), + ClusterObjectFieldDescriptor(Label="verificationKey", Tag=1, Type=typing.Optional[bytes]), ]) checkInNodeID: 'uint' = 0 - key: 'typing.Optional[bytes]' = None + verificationKey: 'typing.Optional[bytes]' = None @dataclass class StayActiveRequest(ClusterCommand): 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 9d5db896be6098..87b2caa5d40969 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 @@ -11300,7 +11300,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const TLV::TLVType outer; ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kCheckInNodeID), checkInNodeID)); - ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kKey), key)); + ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kVerificationKey), verificationKey)); ReturnErrorOnFailure(aWriter.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -11322,8 +11322,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kCheckInNodeID): ReturnErrorOnFailure(DataModel::Decode(reader, checkInNodeID)); break; - case to_underlying(Fields::kKey): - ReturnErrorOnFailure(DataModel::Decode(reader, key)); + case to_underlying(Fields::kVerificationKey): + ReturnErrorOnFailure(DataModel::Decode(reader, verificationKey)); 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 34cc96f868bcc7..c4cc386e4ec289 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 @@ -13872,8 +13872,8 @@ struct DecodableType namespace UnregisterClient { enum class Fields : uint8_t { - kCheckInNodeID = 0, - kKey = 1, + kCheckInNodeID = 0, + kVerificationKey = 1, }; struct Type @@ -13884,7 +13884,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; } chip::NodeId checkInNodeID = static_cast(0); - Optional key; + Optional verificationKey; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -13900,7 +13900,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::IcdManagement::Id; } chip::NodeId checkInNodeID = static_cast(0); - Optional key; + Optional verificationKey; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace UnregisterClient diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index c88a81c1ec38c7..70bb19ef1e88b2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3979,7 +3979,7 @@ class IcdManagementUnregisterClient : public ClusterCommand ClusterCommand("unregister-client", credsIssuerConfig) { AddArgument("CheckInNodeID", 0, UINT64_MAX, &mRequest.checkInNodeID); - AddArgument("Key", &mRequest.key); + AddArgument("VerificationKey", &mRequest.verificationKey); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 56107d510b3470..29a4b69830c349 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -32109,8 +32109,8 @@ class TestIcdManagementClusterSuite : public TestCommand ListFreer listFreer; chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Type value; value.checkInNodeID = 101ULL; - value.key.Emplace(); - value.key.Value() = chip::ByteSpan( + value.verificationKey.Emplace(); + value.verificationKey.Value() = chip::ByteSpan( chip::Uint8::from_const_char("\001!!1AQaq\201\221\241\261\301\321\341\361garbage: not in length on purpose"), 16); return SendCommand(kIdentityAlpha, GetEndpoint(0), IcdManagement::Id, IcdManagement::Commands::UnregisterClient::Id, value, chip::NullOptional