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 b52ff7812d2259..fec5e1c7d27ea9 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 @@ -2193,9 +2193,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 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 3e771d0fdc49aa..f1259f8201f49f 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 @@ -942,9 +942,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 0 { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index fc1c797c713c92..5aabcaad49974e 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1099,9 +1099,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 0 { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index ff34b5a97901e9..4989ee7548dd82 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -592,9 +592,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 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 6a45bfaea79f50..4fca136829d232 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 @@ -429,9 +429,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 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 1c99965aa42a62..063a3d926bda8f 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 @@ -669,9 +669,9 @@ server cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 0 { diff --git a/src/app/clusters/ota-requestor/OTARequestor.cpp b/src/app/clusters/ota-requestor/OTARequestor.cpp index 2183e02eba778c..1c3826839139ea 100644 --- a/src/app/clusters/ota-requestor/OTARequestor.cpp +++ b/src/app/clusters/ota-requestor/OTARequestor.cpp @@ -242,9 +242,9 @@ EmberAfStatus OTARequestor::HandleAnnounceOTAProvider(app::CommandHandler * comm return EMBER_ZCL_STATUS_FAILURE; } - ProviderLocation::Type providerLocation = { .fabricIndex = commandObj->GetAccessingFabricIndex(), - .providerNodeID = commandData.providerNodeId, - .endpoint = commandData.endpoint }; + ProviderLocation::Type providerLocation = { .providerNodeID = commandData.providerNodeId, + .endpoint = commandData.endpoint, + .fabricIndex = commandObj->GetAccessingFabricIndex() }; ChipLogDetail(SoftwareUpdate, " FabricIndex: %u", providerLocation.fabricIndex); ChipLogDetail(SoftwareUpdate, " ProviderNodeID: 0x" ChipLogFormatX64, ChipLogValueX64(providerLocation.providerNodeID)); diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index f9484294f6ad31..5dd8b9d7ba0aae 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -110,9 +110,9 @@ limitations under the License. - + OTA Software Update Requestor diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 652b9c1a08c895..ecb4bdc8d420ab 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2595,9 +2595,9 @@ client cluster OtaSoftwareUpdateRequestor = 42 { } struct ProviderLocation { - fabric_idx fabricIndex = 0; node_id providerNodeID = 1; endpoint_no endpoint = 2; + fabric_idx fabricIndex = 254; } info event StateTransition = 0 { diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index a9fbf72491dd92..059dbfdc0456b1 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -8486,12 +8486,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_providerNodeID; std::string newElement_0_providerNodeIDClassName = "java/lang/Long"; std::string newElement_0_providerNodeIDCtorSignature = "(J)V"; @@ -8504,6 +8498,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_endpointClassName.c_str(), newElement_0_endpointCtorSignature.c_str(), entry_0.endpoint, newElement_0_endpoint); + 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 providerLocationStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -8515,15 +8515,15 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } jmethodID providerLocationStructCtor = env->GetMethodID( - providerLocationStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;)V"); + providerLocationStructClass, "", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (providerLocationStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor"); return nullptr; } - newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_fabricIndex, - newElement_0_providerNodeID, newElement_0_endpoint); + newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID, + newElement_0_endpoint, 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 0845e0ef86378c..de72f10014df0f 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -2634,12 +2634,6 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttr { 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_providerNodeIDItem_1; chip::JniReferences::GetInstance().GetObjectField(element_0, "providerNodeID", "Ljava/lang/Long;", element_0_providerNodeIDItem_1); @@ -2652,6 +2646,12 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProvidersAttr listHolder_0->mList[i_0].endpoint = static_castmList[i_0].endpoint)>>( chip::JniReferences::GetInstance().IntegerToPrimitive(element_0_endpointItem_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 7f8449e3f785b4..485f748412397d 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -12812,12 +12812,6 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac { 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_providerNodeID; std::string newElement_0_providerNodeIDClassName = "java/lang/Long"; std::string newElement_0_providerNodeIDCtorSignature = "(J)V"; @@ -12830,6 +12824,12 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_endpointClassName.c_str(), newElement_0_endpointCtorSignature.c_str(), entry_0.endpoint, newElement_0_endpoint); + 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 providerLocationStructClass; err = chip::JniReferences::GetInstance().GetClassRef( @@ -12841,15 +12841,15 @@ void CHIPOtaSoftwareUpdateRequestorDefaultOtaProvidersAttributeCallback::Callbac return; } jmethodID providerLocationStructCtor = - env->GetMethodID(providerLocationStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;)V"); + env->GetMethodID(providerLocationStructClass, "", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (providerLocationStructCtor == nullptr) { ChipLogError(Zcl, "Could not find ChipStructs$OtaSoftwareUpdateRequestorClusterProviderLocation constructor"); return; } - newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_fabricIndex, - newElement_0_providerNodeID, newElement_0_endpoint); + newElement_0 = env->NewObject(providerLocationStructClass, providerLocationStructCtor, newElement_0_providerNodeID, + newElement_0_endpoint, 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 0ccc267a6bf46f..6c320b9e3d9aaa 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1155,30 +1155,30 @@ public String toString() { } public static class OtaSoftwareUpdateRequestorClusterProviderLocation { - public Integer fabricIndex; public Long providerNodeID; public Integer endpoint; + public Integer fabricIndex; public OtaSoftwareUpdateRequestorClusterProviderLocation( - Integer fabricIndex, Long providerNodeID, Integer endpoint) { - this.fabricIndex = fabricIndex; + Long providerNodeID, Integer endpoint, Integer fabricIndex) { this.providerNodeID = providerNodeID; this.endpoint = endpoint; + this.fabricIndex = fabricIndex; } @Override public String toString() { StringBuilder output = new StringBuilder(); output.append("OtaSoftwareUpdateRequestorClusterProviderLocation {\n"); - output.append("\tfabricIndex: "); - output.append(fabricIndex); - output.append("\n"); output.append("\tproviderNodeID: "); output.append(providerNodeID); output.append("\n"); output.append("\tendpoint: "); output.append(endpoint); 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 92099613845d55..2517acc94b7537 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -7574,14 +7574,14 @@ class ProviderLocation(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="providerNodeID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="endpoint", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), ]) - fabricIndex: 'uint' = 0 providerNodeID: 'uint' = 0 endpoint: 'uint' = 0 + fabricIndex: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index b36a78528da32f..75762a345c9831 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -7039,9 +7039,9 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader auto & entry_0 = iter_0.GetValue(); CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0; newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID]; newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint]; + 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 e6a03710a9f6aa..d744621d8a7b58 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -6515,9 +6515,9 @@ auto & entry_0 = iter_0.GetValue(); CHIPOtaSoftwareUpdateRequestorClusterProviderLocation * newElement_0; newElement_0 = [CHIPOtaSoftwareUpdateRequestorClusterProviderLocation new]; - newElement_0.fabricIndex = [NSNumber numberWithUnsignedChar:entry_0.fabricIndex]; newElement_0.providerNodeID = [NSNumber numberWithUnsignedLongLong:entry_0.providerNodeID]; newElement_0.endpoint = [NSNumber numberWithUnsignedShort:entry_0.endpoint]; + 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 861e8b65b00264..47a67f528ba32a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -16826,9 +16826,9 @@ new CHIPDefaultSuccessCallbackBridge( return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (CHIPOtaSoftwareUpdateRequestorClusterProviderLocation *) value[i_0]; - listHolder_0->mList[i_0].fabricIndex = element_0.fabricIndex.unsignedCharValue; listHolder_0->mList[i_0].providerNodeID = element_0.providerNodeID.unsignedLongLongValue; listHolder_0->mList[i_0].endpoint = element_0.endpoint.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 298ecb7feda3c9..ee0c857cf60b76 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -111,9 +111,9 @@ NS_ASSUME_NONNULL_BEGIN @end @interface CHIPOtaSoftwareUpdateRequestorClusterProviderLocation : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull fabricIndex; @property (strong, nonatomic) NSNumber * _Nonnull providerNodeID; @property (strong, nonatomic) NSNumber * _Nonnull endpoint; +@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 14b6fe68d8342c..87f70fb64d846e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -209,11 +209,11 @@ - (instancetype)init { if (self = [super init]) { - _fabricIndex = @(0); - _providerNodeID = @(0); _endpoint = @(0); + + _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 8e1f3a9ed271bc..ef72f039211f47 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 @@ -421,9 +421,9 @@ typedef struct _PowerProfileRecord // Struct for ProviderLocation typedef struct _ProviderLocation { - chip::FabricIndex FabricIndex; chip::NodeId ProviderNodeID; chip::EndpointId Endpoint; + chip::FabricIndex FabricIndex; } ProviderLocation; // Struct for ReadAttributeStatusRecord 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 526052fd5a10f6..17b014f0654414 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 @@ -6349,12 +6349,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::kProviderNodeID)), providerNodeID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoint)), endpoint)); if (accessingFabricIndex.HasValue()) { ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); } - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kProviderNodeID)), providerNodeID)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpoint)), endpoint)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -6371,15 +6371,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::kProviderNodeID): ReturnErrorOnFailure(DataModel::Decode(reader, providerNodeID)); break; case to_underlying(Fields::kEndpoint): ReturnErrorOnFailure(DataModel::Decode(reader, endpoint)); 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 618c7105dadc73..00ff823318fbd2 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 @@ -8910,17 +8910,17 @@ namespace Structs { namespace ProviderLocation { enum class Fields { - kFabricIndex = 0, kProviderNodeID = 1, kEndpoint = 2, + kFabricIndex = 254, }; struct Type { public: - chip::FabricIndex fabricIndex = static_cast(0); chip::NodeId providerNodeID = static_cast(0); chip::EndpointId endpoint = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); 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 1216983efce78b..00402ef3512ff5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1512,31 +1512,31 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ProviderLocation.fabricIndex", "fabricIndex", value.isMember("fabricIndex"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ProviderLocation.providerNodeID", "providerNodeID", value.isMember("providerNodeID"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("ProviderLocation.endpoint", "endpoint", value.isMember("endpoint"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("ProviderLocation.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, "providerNodeID"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.providerNodeID, value["providerNodeID"])); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "endpoint"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.endpoint, value["endpoint"])); + 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::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type & request) { - ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.providerNodeID); ComplexArgumentParser::Finalize(request.endpoint); + ComplexArgumentParser::Finalize(request.fabricIndex); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::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 7300a3c9f2edd3..de73f4d45474c5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1623,26 +1623,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("ProviderNodeID", indent + 1, value.providerNodeID); 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 'ProviderNodeID'"); return err; } } { - CHIP_ERROR err = LogValue("ProviderNodeID", indent + 1, value.providerNodeID); + CHIP_ERROR err = LogValue("Endpoint", indent + 1, value.endpoint); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProviderNodeID'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Endpoint'"); return err; } } { - CHIP_ERROR err = LogValue("Endpoint", indent + 1, value.endpoint); + 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 'Endpoint'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); return err; } }