From 2b45f3401fad7586af474da3140eee3efee947d2 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Wed, 8 Jun 2022 16:59:37 +0000 Subject: [PATCH] Update TestListStructOctet to use member names that are generic --- .../all-clusters-app.matter | 4 +- .../all-clusters-minimal-app.matter | 4 +- .../tv-casting-common/tv-casting-app.matter | 4 +- src/app/tests/suites/TestCluster.yaml | 16 +++---- .../zcl/data-model/chip/test-cluster.xml | 4 +- .../data_model/controller-clusters.matter | 4 +- .../CHIPAttributeTLVValueDecoder.cpp | 28 ++++++------ .../zap-generated/CHIPClustersWrite-JNI.cpp | 20 ++++----- .../java/zap-generated/CHIPReadCallbacks.cpp | 26 +++++------ .../chip/devicecontroller/ChipStructs.java | 18 ++++---- .../python/chip/clusters/Objects.py | 8 ++-- .../CHIPAttributeTLVValueDecoder.mm | 5 +-- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 5 +-- .../CHIP/zap-generated/CHIPClustersObjc.mm | 4 +- .../CHIP/zap-generated/CHIPStructsObjc.h | 4 +- .../CHIP/zap-generated/CHIPStructsObjc.mm | 9 ++-- .../app-common/zap-generated/af-structs.h | 4 +- .../zap-generated/cluster-objects.cpp | 12 ++--- .../zap-generated/cluster-objects.h | 8 ++-- .../cluster/ComplexArgumentParser.cpp | 18 ++++---- .../cluster/logging/DataModelLogger.cpp | 8 ++-- .../chip-tool/zap-generated/test/Commands.h | 32 +++++++------- .../zap-generated/cluster/Commands.h | 5 +-- .../zap-generated/test/Commands.h | 44 +++++++------------ 24 files changed, 137 insertions(+), 157 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 01fe4ef4378dd5..20e13dd20c7d05 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 @@ -3084,8 +3084,8 @@ server cluster TestCluster = 1295 { } struct TestListStructOctet { - fabric_id fabricId = 0; - octet_string<32> operationalCert = 1; + int64u member1 = 0; + octet_string<32> member2 = 1; } struct NullablesAndOptionalsStruct { diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 39ee4ff98dfdd5..8f825878a122ca 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2554,8 +2554,8 @@ server cluster TestCluster = 1295 { } struct TestListStructOctet { - fabric_id fabricId = 0; - octet_string<32> operationalCert = 1; + int64u member1 = 0; + octet_string<32> member2 = 1; } struct NullablesAndOptionalsStruct { 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 76bf751452b438..7671d3c7782fa7 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 @@ -1897,8 +1897,8 @@ server cluster TestCluster = 1295 { } struct TestListStructOctet { - fabric_id fabricId = 0; - octet_string<32> operationalCert = 1; + int64u member1 = 0; + octet_string<32> member2 = 1; } info event TestEvent = 1 { diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml index 6a533dbf82596c..85b33b6525d9a0 100644 --- a/src/app/tests/suites/TestCluster.yaml +++ b/src/app/tests/suites/TestCluster.yaml @@ -1562,10 +1562,10 @@ tests: arguments: value: [ - { fabricId: 0, operationalCert: "Test0" }, - { fabricId: 1, operationalCert: "Test1" }, - { fabricId: 2, operationalCert: "Test2" }, - { fabricId: 3, operationalCert: "Test3" }, + { member1: 0, member2: "Test0" }, + { member1: 1, member2: "Test1" }, + { member1: 2, member2: "Test2" }, + { member1: 3, member2: "Test3" }, ] - label: "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING" @@ -1574,10 +1574,10 @@ tests: response: value: [ - { fabricId: 0, operationalCert: "Test0" }, - { fabricId: 1, operationalCert: "Test1" }, - { fabricId: 2, operationalCert: "Test2" }, - { fabricId: 3, operationalCert: "Test3" }, + { member1: 0, member2: "Test0" }, + { member1: 1, member2: "Test1" }, + { member1: 2, member2: "Test2" }, + { member1: 3, member2: "Test3" }, ] # Tests for Nullables and Optionals diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml index 6530f358817972..bb6870c9e345bf 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 @@ -18,8 +18,8 @@ limitations under the License. - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index fb95ead9553b94..f8daf847f9c4e9 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3518,8 +3518,8 @@ client cluster TestCluster = 1295 { } struct TestListStructOctet { - fabric_id fabricId = 0; - octet_string<32> operationalCert = 1; + int64u member1 = 0; + octet_string<32> member2 = 1; } struct NullablesAndOptionalsStruct { diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 94f83c23605500..0df4dd0bdbacdf 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -13729,19 +13729,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricId; - std::string newElement_0_fabricIdClassName = "java/lang/Long"; - std::string newElement_0_fabricIdCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIdClassName.c_str(), - newElement_0_fabricIdCtorSignature.c_str(), - entry_0.fabricId, newElement_0_fabricId); - jobject newElement_0_operationalCert; - jbyteArray newElement_0_operationalCertByteArray = - env->NewByteArray(static_cast(entry_0.operationalCert.size())); - env->SetByteArrayRegion(newElement_0_operationalCertByteArray, 0, - static_cast(entry_0.operationalCert.size()), - reinterpret_cast(entry_0.operationalCert.data())); - newElement_0_operationalCert = newElement_0_operationalCertByteArray; + jobject newElement_0_member1; + std::string newElement_0_member1ClassName = "java/lang/Long"; + std::string newElement_0_member1CtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_member1ClassName.c_str(), + newElement_0_member1CtorSignature.c_str(), + entry_0.member1, newElement_0_member1); + jobject newElement_0_member2; + jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast(entry_0.member2.size())); + env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast(entry_0.member2.size()), + reinterpret_cast(entry_0.member2.data())); + newElement_0_member2 = newElement_0_member2ByteArray; jclass testListStructOctetStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -13759,8 +13757,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_fabricId, - newElement_0_operationalCert); + newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1, + newElement_0_member2); 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 59082cc3cbbfab..d21c690816cb13 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -5174,18 +5174,16 @@ JNI_METHOD(void, TestClusterCluster, writeListStructOctetStringAttribute) { jobject element_0; chip::JniReferences::GetInstance().GetListItem(value, i_0, element_0); - jobject element_0_fabricIdItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "fabricId", "Ljava/lang/Long;", - element_0_fabricIdItem_1); - listHolder_0->mList[i_0].fabricId = - static_castmList[i_0].fabricId)>>( - chip::JniReferences::GetInstance().LongToPrimitive(element_0_fabricIdItem_1)); - jobject element_0_operationalCertItem_1; - chip::JniReferences::GetInstance().GetObjectField(element_0, "operationalCert", "[B", - element_0_operationalCertItem_1); + jobject element_0_member1Item_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "member1", "Ljava/lang/Long;", + element_0_member1Item_1); + listHolder_0->mList[i_0].member1 = static_castmList[i_0].member1)>>( + chip::JniReferences::GetInstance().LongToPrimitive(element_0_member1Item_1)); + jobject element_0_member2Item_1; + chip::JniReferences::GetInstance().GetObjectField(element_0, "member2", "[B", element_0_member2Item_1); cleanupByteArrays.push_back( - chip::Platform::MakeUnique(env, static_cast(element_0_operationalCertItem_1))); - listHolder_0->mList[i_0].operationalCert = cleanupByteArrays.back()->byteSpan(); + chip::Platform::MakeUnique(env, static_cast(element_0_member2Item_1))); + listHolder_0->mList[i_0].member2 = cleanupByteArrays.back()->byteSpan(); } 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 ed96c8d611fb88..a1e32b98819411 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -20141,17 +20141,17 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_fabricId; - std::string newElement_0_fabricIdClassName = "java/lang/Long"; - std::string newElement_0_fabricIdCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_fabricIdClassName.c_str(), - newElement_0_fabricIdCtorSignature.c_str(), entry_0.fabricId, - newElement_0_fabricId); - jobject newElement_0_operationalCert; - jbyteArray newElement_0_operationalCertByteArray = env->NewByteArray(static_cast(entry_0.operationalCert.size())); - env->SetByteArrayRegion(newElement_0_operationalCertByteArray, 0, static_cast(entry_0.operationalCert.size()), - reinterpret_cast(entry_0.operationalCert.data())); - newElement_0_operationalCert = newElement_0_operationalCertByteArray; + jobject newElement_0_member1; + std::string newElement_0_member1ClassName = "java/lang/Long"; + std::string newElement_0_member1CtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_member1ClassName.c_str(), + newElement_0_member1CtorSignature.c_str(), entry_0.member1, + newElement_0_member1); + jobject newElement_0_member2; + jbyteArray newElement_0_member2ByteArray = env->NewByteArray(static_cast(entry_0.member2.size())); + env->SetByteArrayRegion(newElement_0_member2ByteArray, 0, static_cast(entry_0.member2.size()), + reinterpret_cast(entry_0.member2.data())); + newElement_0_member2 = newElement_0_member2ByteArray; jclass testListStructOctetStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -20169,8 +20169,8 @@ void CHIPTestClusterListStructOctetStringAttributeCallback::CallbackFn( return; } - newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_fabricId, - newElement_0_operationalCert); + newElement_0 = env->NewObject(testListStructOctetStructClass, testListStructOctetStructCtor, newElement_0_member1, + newElement_0_member2); 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 e5112eba589da2..4affe8b8bd6946 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1825,23 +1825,23 @@ public String toString() { } public static class TestClusterClusterTestListStructOctet { - public Long fabricId; - public byte[] operationalCert; + public Long member1; + public byte[] member2; - public TestClusterClusterTestListStructOctet(Long fabricId, byte[] operationalCert) { - this.fabricId = fabricId; - this.operationalCert = operationalCert; + public TestClusterClusterTestListStructOctet(Long member1, byte[] member2) { + this.member1 = member1; + this.member2 = member2; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("TestClusterClusterTestListStructOctet {\n"); - output.append("\tfabricId: "); - output.append(fabricId); + output.append("\tmember1: "); + output.append(member1); output.append("\n"); - output.append("\toperationalCert: "); - output.append(Arrays.toString(operationalCert)); + output.append("\tmember2: "); + output.append(Arrays.toString(member2)); 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 ae71809e5076e3..b89689a1e39d53 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -34238,12 +34238,12 @@ class TestListStructOctet(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="operationalCert", Tag=1, Type=bytes), + ClusterObjectFieldDescriptor(Label="member1", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="member2", Tag=1, Type=bytes), ]) - fabricId: 'uint' = 0 - operationalCert: 'bytes' = b"" + member1: 'uint' = 0 + member2: 'bytes' = b"" diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index eed68526195901..98b0a58b532c52 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -13086,9 +13086,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPTestClusterClusterTestListStructOctet * newElement_0; newElement_0 = [CHIPTestClusterClusterTestListStructOctet new]; - newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; - newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data() - length:entry_0.operationalCert.size()]; + newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1]; + newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()]; [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 595be5a6a22b56..001d1db935f0c5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -9308,9 +9308,8 @@ auto & entry_0 = iter_0.GetValue(); CHIPTestClusterClusterTestListStructOctet * newElement_0; newElement_0 = [CHIPTestClusterClusterTestListStructOctet new]; - newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; - newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data() - length:entry_0.operationalCert.size()]; + newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1]; + newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()]; [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 08b408f55778d9..1a08833ad56f11 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -61342,8 +61342,8 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPTestClusterClusterTestListStructOctet *) value[i_0]; - listHolder_0->mList[i_0].fabricId = element_0.fabricId.unsignedLongLongValue; - listHolder_0->mList[i_0].operationalCert = [self asByteSpan:element_0.operationalCert]; + listHolder_0->mList[i_0].member1 = element_0.member1.unsignedLongLongValue; + listHolder_0->mList[i_0].member2 = [self asByteSpan:element_0.member2]; } 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 2bb2000c41de67..c92fd3dd0554c9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -755,8 +755,8 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPTestClusterClusterTestListStructOctet : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricId; -@property (strong, nonatomic) NSData * _Nonnull operationalCert; +@property (strong, nonatomic) NSNumber * _Nonnull member1; +@property (strong, nonatomic) NSData * _Nonnull member2; - (instancetype)init; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 0ca6eeb35bcbdb..1ba999b68586a1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -2665,18 +2665,17 @@ - (instancetype)init { if (self = [super init]) { - _fabricId = @(0); + _member1 = @(0); - _operationalCert = [NSData data]; + _member2 = [NSData data]; } return self; } - (NSString *)description { - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: fabricId:%@; operationalCert:%@; >", NSStringFromClass([self class]), _fabricId, - [_operationalCert base64EncodedStringWithOptions:0]]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: member1:%@; member2:%@; >", NSStringFromClass([self class]), + _member1, [_member2 base64EncodedStringWithOptions:0]]; return descriptionString; } 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 fea2a0aa4cf10f..a1f08695b65e13 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 @@ -543,8 +543,8 @@ typedef struct _TargetStruct // Struct for TestListStructOctet typedef struct _TestListStructOctet { - chip::FabricId fabricId; - chip::ByteSpan operationalCert; + uint64_t member1; + chip::ByteSpan member2; } TestListStructOctet; // Struct for ThermostatScheduleTransition 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 9d0c8825b2d747..83dd81249a1722 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 @@ -23441,8 +23441,8 @@ 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::kFabricId)), fabricId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationalCert)), operationalCert)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMember1)), member1)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMember2)), member2)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -23462,11 +23462,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kFabricId): - ReturnErrorOnFailure(DataModel::Decode(reader, fabricId)); + case to_underlying(Fields::kMember1): + ReturnErrorOnFailure(DataModel::Decode(reader, member1)); break; - case to_underlying(Fields::kOperationalCert): - ReturnErrorOnFailure(DataModel::Decode(reader, operationalCert)); + case to_underlying(Fields::kMember2): + ReturnErrorOnFailure(DataModel::Decode(reader, member2)); 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 b9107bc25e716f..0e1f5749d75b79 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 @@ -31350,15 +31350,15 @@ struct DecodableType namespace TestListStructOctet { enum class Fields { - kFabricId = 0, - kOperationalCert = 1, + kMember1 = 0, + kMember2 = 1, }; struct Type { public: - chip::FabricId fabricId = static_cast(0); - chip::ByteSpan operationalCert; + uint64_t member1 = static_cast(0); + chip::ByteSpan member2; CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 42d5f1f8de8bff..b3fe22bc7ed722 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -2063,24 +2063,24 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.fabricId", "fabricId", value.isMember("fabricId"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.operationalCert", "operationalCert", - value.isMember("operationalCert"))); + ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.member1", "member1", value.isMember("member1"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("TestListStructOctet.member2", "member2", value.isMember("member2"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricId"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricId, value["fabricId"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "member1"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.member1, value["member1"])); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "operationalCert"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.operationalCert, value["operationalCert"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "member2"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.member2, value["member2"])); return CHIP_NO_ERROR; } void ComplexArgumentParser::Finalize(chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type & request) { - ComplexArgumentParser::Finalize(request.fabricId); - ComplexArgumentParser::Finalize(request.operationalCert); + ComplexArgumentParser::Finalize(request.member1); + ComplexArgumentParser::Finalize(request.member2); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::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 8a96dc2cd0cbad..437372a39a1745 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -2203,18 +2203,18 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("FabricId", indent + 1, value.fabricId); + CHIP_ERROR err = LogValue("Member1", indent + 1, value.member1); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricId'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member1'"); return err; } } { - CHIP_ERROR err = LogValue("OperationalCert", indent + 1, value.operationalCert); + CHIP_ERROR err = LogValue("Member2", indent + 1, value.member2); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'OperationalCert'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Member2'"); return err; } } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 6e24f6ed36acc0..286f5ed00e50a0 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -42443,20 +42443,20 @@ class TestClusterSuite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("listStructOctetString", iter_0, 0)); - VerifyOrReturn(CheckValue("listStructOctetString[0].fabricId", iter_0.GetValue().fabricId, 0ULL)); - VerifyOrReturn(CheckValueAsString("listStructOctetString[0].operationalCert", iter_0.GetValue().operationalCert, + VerifyOrReturn(CheckValue("listStructOctetString[0].member1", iter_0.GetValue().member1, 0ULL)); + VerifyOrReturn(CheckValueAsString("listStructOctetString[0].member2", iter_0.GetValue().member2, chip::ByteSpan(chip::Uint8::from_const_char("Test0"), 5))); VerifyOrReturn(CheckNextListItemDecodes("listStructOctetString", iter_0, 1)); - VerifyOrReturn(CheckValue("listStructOctetString[1].fabricId", iter_0.GetValue().fabricId, 1ULL)); - VerifyOrReturn(CheckValueAsString("listStructOctetString[1].operationalCert", iter_0.GetValue().operationalCert, + VerifyOrReturn(CheckValue("listStructOctetString[1].member1", iter_0.GetValue().member1, 1ULL)); + VerifyOrReturn(CheckValueAsString("listStructOctetString[1].member2", iter_0.GetValue().member2, chip::ByteSpan(chip::Uint8::from_const_char("Test1"), 5))); VerifyOrReturn(CheckNextListItemDecodes("listStructOctetString", iter_0, 2)); - VerifyOrReturn(CheckValue("listStructOctetString[2].fabricId", iter_0.GetValue().fabricId, 2ULL)); - VerifyOrReturn(CheckValueAsString("listStructOctetString[2].operationalCert", iter_0.GetValue().operationalCert, + VerifyOrReturn(CheckValue("listStructOctetString[2].member1", iter_0.GetValue().member1, 2ULL)); + VerifyOrReturn(CheckValueAsString("listStructOctetString[2].member2", iter_0.GetValue().member2, chip::ByteSpan(chip::Uint8::from_const_char("Test2"), 5))); VerifyOrReturn(CheckNextListItemDecodes("listStructOctetString", iter_0, 3)); - VerifyOrReturn(CheckValue("listStructOctetString[3].fabricId", iter_0.GetValue().fabricId, 3ULL)); - VerifyOrReturn(CheckValueAsString("listStructOctetString[3].operationalCert", iter_0.GetValue().operationalCert, + VerifyOrReturn(CheckValue("listStructOctetString[3].member1", iter_0.GetValue().member1, 3ULL)); + VerifyOrReturn(CheckValueAsString("listStructOctetString[3].member2", iter_0.GetValue().member2, chip::ByteSpan(chip::Uint8::from_const_char("Test3"), 5))); VerifyOrReturn(CheckNoMoreListItems("listStructOctetString", iter_0, 4)); } @@ -46220,20 +46220,20 @@ class TestClusterSuite : public TestCommand auto * listHolder_0 = new ListHolder(4); listFreer.add(listHolder_0); - listHolder_0->mList[0].fabricId = 0ULL; - listHolder_0->mList[0].operationalCert = + listHolder_0->mList[0].member1 = 0ULL; + listHolder_0->mList[0].member2 = chip::ByteSpan(chip::Uint8::from_const_char("Test0garbage: not in length on purpose"), 5); - listHolder_0->mList[1].fabricId = 1ULL; - listHolder_0->mList[1].operationalCert = + listHolder_0->mList[1].member1 = 1ULL; + listHolder_0->mList[1].member2 = chip::ByteSpan(chip::Uint8::from_const_char("Test1garbage: not in length on purpose"), 5); - listHolder_0->mList[2].fabricId = 2ULL; - listHolder_0->mList[2].operationalCert = + listHolder_0->mList[2].member1 = 2ULL; + listHolder_0->mList[2].member2 = chip::ByteSpan(chip::Uint8::from_const_char("Test2garbage: not in length on purpose"), 5); - listHolder_0->mList[3].fabricId = 3ULL; - listHolder_0->mList[3].operationalCert = + listHolder_0->mList[3].member1 = 3ULL; + listHolder_0->mList[3].member2 = chip::ByteSpan(chip::Uint8::from_const_char("Test3garbage: not in length on purpose"), 5); value = chip::app::DataModel::List( diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 3e933ab8c5c735..aefa5983cbf21b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -72600,9 +72600,8 @@ class WriteTestClusterListStructOctetString : public WriteAttribute { for (auto & entry_0 : mValue) { CHIPTestClusterClusterTestListStructOctet * newElement_0; newElement_0 = [CHIPTestClusterClusterTestListStructOctet new]; - newElement_0.fabricId = [NSNumber numberWithUnsignedLongLong:entry_0.fabricId]; - newElement_0.operationalCert = [NSData dataWithBytes:entry_0.operationalCert.data() - length:entry_0.operationalCert.size()]; + newElement_0.member1 = [NSNumber numberWithUnsignedLongLong:entry_0.member1]; + newElement_0.member2 = [NSData dataWithBytes:entry_0.member2.data() length:entry_0.member2.size()]; [array_0 addObject:newElement_0]; } value = array_0; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 37379f3221d453..7c3adbeee38775 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -75226,24 +75226,20 @@ class TestCluster : public TestCommandBridge { { NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; temp_0[0] = [[CHIPTestClusterClusterTestListStructOctet alloc] init]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).fabricId = [NSNumber numberWithUnsignedLongLong:0ULL]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).operationalCert = [[NSData alloc] initWithBytes:"Test0" - length:5]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).member1 = [NSNumber numberWithUnsignedLongLong:0ULL]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[0]).member2 = [[NSData alloc] initWithBytes:"Test0" length:5]; temp_0[1] = [[CHIPTestClusterClusterTestListStructOctet alloc] init]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).fabricId = [NSNumber numberWithUnsignedLongLong:1ULL]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).operationalCert = [[NSData alloc] initWithBytes:"Test1" - length:5]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).member1 = [NSNumber numberWithUnsignedLongLong:1ULL]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[1]).member2 = [[NSData alloc] initWithBytes:"Test1" length:5]; temp_0[2] = [[CHIPTestClusterClusterTestListStructOctet alloc] init]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).fabricId = [NSNumber numberWithUnsignedLongLong:2ULL]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).operationalCert = [[NSData alloc] initWithBytes:"Test2" - length:5]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).member1 = [NSNumber numberWithUnsignedLongLong:2ULL]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[2]).member2 = [[NSData alloc] initWithBytes:"Test2" length:5]; temp_0[3] = [[CHIPTestClusterClusterTestListStructOctet alloc] init]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).fabricId = [NSNumber numberWithUnsignedLongLong:3ULL]; - ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).operationalCert = [[NSData alloc] initWithBytes:"Test3" - length:5]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).member1 = [NSNumber numberWithUnsignedLongLong:3ULL]; + ((CHIPTestClusterClusterTestListStructOctet *) temp_0[3]).member2 = [[NSData alloc] initWithBytes:"Test3" length:5]; listStructOctetStringArgument = temp_0; } @@ -75273,25 +75269,17 @@ class TestCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("list_struct_octet_string", [actualValue count], static_cast(4))); - VerifyOrReturn( - CheckValue("fabricId", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).fabricId, 0ULL)); - VerifyOrReturn(CheckValueAsString("operationalCert", - ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).operationalCert, + VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).member1, 0ULL)); + VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[0]).member2, [[NSData alloc] initWithBytes:"Test0" length:5])); - VerifyOrReturn( - CheckValue("fabricId", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).fabricId, 1ULL)); - VerifyOrReturn(CheckValueAsString("operationalCert", - ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).operationalCert, + VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).member1, 1ULL)); + VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[1]).member2, [[NSData alloc] initWithBytes:"Test1" length:5])); - VerifyOrReturn( - CheckValue("fabricId", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).fabricId, 2ULL)); - VerifyOrReturn(CheckValueAsString("operationalCert", - ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).operationalCert, + VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).member1, 2ULL)); + VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[2]).member2, [[NSData alloc] initWithBytes:"Test2" length:5])); - VerifyOrReturn( - CheckValue("fabricId", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).fabricId, 3ULL)); - VerifyOrReturn(CheckValueAsString("operationalCert", - ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).operationalCert, + VerifyOrReturn(CheckValue("member1", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).member1, 3ULL)); + VerifyOrReturn(CheckValueAsString("member2", ((CHIPTestClusterClusterTestListStructOctet *) actualValue[3]).member2, [[NSData alloc] initWithBytes:"Test3" length:5])); }