From b8a6beff757502a1f286f417aa8c15b342d779be Mon Sep 17 00:00:00 2001 From: Marc Lepage Date: Mon, 29 Nov 2021 11:02:07 -0500 Subject: [PATCH] Regen and restyle --- .../python/chip/clusters/CHIPClusters.cpp | 1862 +---------------- .../python/chip/clusters/Objects.py | 8 +- 2 files changed, 8 insertions(+), 1862 deletions(-) diff --git a/src/controller/python/chip/clusters/CHIPClusters.cpp b/src/controller/python/chip/clusters/CHIPClusters.cpp index 9cf600060fad08..4c7b19e2e9bd16 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.cpp +++ b/src/controller/python/chip/clusters/CHIPClusters.cpp @@ -106,63 +106,6 @@ static void OnAccessControlAclListAttributeResponse( const chip::app::DataModel::Nullable< chip::app::DataModel::DecodableList> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " FabricIndex: %" PRIu8 ",", entry.fabricIndex); - ChipLogProgress(Zcl, " Privilege: %" PRIu8 ",", entry.privilege); - ChipLogProgress(Zcl, " AuthMode: %" PRIu8 ",", entry.authMode); - if (entry.subjects.IsNull()) { - ChipLogProgress(chipTool, " Subjects: null"); - } else { - ChipLogProgress(chipTool, " Subjects: list member of struct element of list attribute printing not supported yet"); - } - if (entry.targets.IsNull()) { - ChipLogProgress(chipTool, " Targets: null"); - } else { - ChipLogProgress(chipTool, " Targets: list member of struct element of list attribute printing not supported yet"); - } - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -174,51 +117,6 @@ static void OnAccessControlExtensionListAttributeResponse( const chip::app::DataModel::Nullable< chip::app::DataModel::DecodableList> & list) { -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " FabricIndex: %" PRIu8 ",", entry.fabricIndex); - ChipLogProgress(Zcl, " Data: %s,", ByteSpanToString(entry.data).c_str()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -229,50 +127,6 @@ static void OnApplicationLauncherApplicationLauncherListListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu16 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -284,55 +138,6 @@ static void OnAudioOutputAudioOutputListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " index: %" PRIu8 ",", entry.index); - ChipLogProgress(Zcl, " outputType: %" PRIu8 ",", entry.outputType); - ChipLogProgress(Zcl, " name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -343,58 +148,6 @@ static void OnBridgedActionsActionListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " ActionID: %" PRIu16 ",", entry.actionID); - ChipLogProgress(Zcl, " Name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " Type: %" PRIu8 ",", entry.type); - ChipLogProgress(Zcl, " EndpointListID: %" PRIu16 ",", entry.endpointListID); - ChipLogProgress(Zcl, " SupportedCommands: %" PRIu16 ",", entry.supportedCommands); - ChipLogProgress(Zcl, " Status: %" PRIu8 ",", entry.status); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -406,56 +159,6 @@ static void OnBridgedActionsEndpointListListAttributeResponse( const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " EndpointListID: %" PRIu16 ",", entry.endpointListID); - ChipLogProgress(Zcl, " Name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " Type: %" PRIu8 ",", entry.type); - ChipLogProgress(chipTool, " Endpoints: list member of struct element of list attribute printing not supported yet"); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -466,51 +169,6 @@ static void OnContentLauncherAcceptsHeaderListListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " %s,", ByteSpanToString(entry).c_str()); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -520,51 +178,6 @@ static void OnContentLauncherSupportedStreamingTypesListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -575,54 +188,6 @@ static void OnDescriptorDeviceListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " type: %" PRIu32 ",", entry.type); - ChipLogProgress(Zcl, " revision: %" PRIu16 ",", entry.revision); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -632,51 +197,6 @@ chip::Callback::Callback gDescriptorD static void OnDescriptorServerListListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu32 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -686,51 +206,6 @@ chip::Callback::Callback gDescriptorS static void OnDescriptorClientListListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu32 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -740,51 +215,6 @@ chip::Callback::Callback gDescriptorC static void OnDescriptorPartsListListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu16 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -795,54 +225,6 @@ static void OnFixedLabelLabelListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " label: %.*s,", static_cast(entry.label.size()), entry.label.data()); - ChipLogProgress(Zcl, " value: %.*s,", static_cast(entry.value.size()), entry.value.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -854,53 +236,6 @@ static void OnGeneralCommissioningBasicCommissioningInfoListListAttributeRespons const chip::app::DataModel::DecodableList< chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " FailSafeExpiryLengthMs: %" PRIu32 ",", entry.failSafeExpiryLengthMs); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -913,58 +248,6 @@ static void OnGeneralDiagnosticsNetworkInterfacesListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " Name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " FabricConnected: %d,", entry.fabricConnected); - ChipLogProgress(Zcl, " OffPremiseServicesReachableIPv4: %d,", entry.offPremiseServicesReachableIPv4); - ChipLogProgress(Zcl, " OffPremiseServicesReachableIPv6: %d,", entry.offPremiseServicesReachableIPv6); - ChipLogProgress(Zcl, " HardwareAddress: %s,", ByteSpanToString(entry.hardwareAddress).c_str()); - ChipLogProgress(Zcl, " Type: %" PRIu8 ",", entry.type); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -974,51 +257,6 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1028,51 +266,6 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1082,110 +275,16 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } chip::Callback::Callback gGeneralDiagnosticsActiveNetworkFaultsListAttributeCallback{ OnGeneralDiagnosticsActiveNetworkFaultsListAttributeResponse, nullptr }; -static void OnGroupKeyManagementGroupsListAttributeResponse( - void * context, - const chip::app::DataModel::DecodableList & list) -{ -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " VendorId: %" PRIu16 ",", entry.vendorId); - ChipLogProgress(Zcl, " VendorGroupId: %" PRIu16 ",", entry.vendorGroupId); - ChipLogProgress(Zcl, " GroupKeySetIndex: %" PRIu16 ",", entry.groupKeySetIndex); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master +static void OnGroupKeyManagementGroupsListAttributeResponse( + void * context, + const chip::app::DataModel::DecodableList & list) +{ if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1196,57 +295,6 @@ static void OnGroupKeyManagementGroupKeysListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " VendorId: %" PRIu16 ",", entry.vendorId); - ChipLogProgress(Zcl, " GroupKeyIndex: %" PRIu16 ",", entry.groupKeyIndex); - ChipLogProgress(Zcl, " GroupKeyRoot: %s,", ByteSpanToString(entry.groupKeyRoot).c_str()); - ChipLogProgress(Zcl, " GroupKeyEpochStartTime: %" PRIu64 ",", entry.groupKeyEpochStartTime); - ChipLogProgress(Zcl, " GroupKeySecurityPolicy: %" PRIu8 ",", entry.groupKeySecurityPolicy); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1257,56 +305,6 @@ static void OnMediaInputMediaInputListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " index: %" PRIu8 ",", entry.index); - ChipLogProgress(Zcl, " inputType: %" PRIu8 ",", entry.inputType); - ChipLogProgress(Zcl, " name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " description: %.*s,", static_cast(entry.description.size()), entry.description.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1317,55 +315,6 @@ static void OnModeSelectSupportedModesListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " Label: %.*s,", static_cast(entry.label.size()), entry.label.data()); - ChipLogProgress(Zcl, " Mode: %" PRIu8 ",", entry.mode); - ChipLogProgress(Zcl, " SemanticTag: %" PRIu32 ",", entry.semanticTag); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1377,58 +326,6 @@ static void OnOperationalCredentialsFabricsListListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " FabricIndex: %" PRIu8 ",", entry.fabricIndex); - ChipLogProgress(Zcl, " RootPublicKey: %s,", ByteSpanToString(entry.rootPublicKey).c_str()); - ChipLogProgress(Zcl, " VendorId: %" PRIu16 ",", entry.vendorId); - ChipLogProgress(Zcl, " FabricId: %" PRIu64 ",", entry.fabricId); - ChipLogProgress(Zcl, " NodeId: %" PRIu64 ",", entry.nodeId); - ChipLogProgress(Zcl, " Label: %.*s,", static_cast(entry.label.size()), entry.label.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1437,51 +334,6 @@ chip::Callback::Callback static void OnOperationalCredentialsTrustedRootCertificatesListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " %s,", ByteSpanToString(entry).c_str()); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1492,51 +344,6 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1548,57 +355,6 @@ static void OnSoftwareDiagnosticsThreadMetricsListAttributeResponse( const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " Id: %" PRIu64 ",", entry.id); - ChipLogProgress(Zcl, " Name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " StackFreeCurrent: %" PRIu32 ",", entry.stackFreeCurrent); - ChipLogProgress(Zcl, " StackFreeMinimum: %" PRIu32 ",", entry.stackFreeMinimum); - ChipLogProgress(Zcl, " StackSize: %" PRIu32 ",", entry.stackSize); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1608,57 +364,6 @@ static void OnTvChannelTvChannelListListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " majorNumber: %" PRIu16 ",", entry.majorNumber); - ChipLogProgress(Zcl, " minorNumber: %" PRIu16 ",", entry.minorNumber); - ChipLogProgress(Zcl, " name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " callSign: %.*s,", static_cast(entry.callSign.size()), entry.callSign.data()); - ChipLogProgress(Zcl, " affiliateCallSign: %.*s,", static_cast(entry.affiliateCallSign.size()), entry.affiliateCallSign.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1670,54 +375,6 @@ static void OnTargetNavigatorTargetNavigatorListListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " identifier: %" PRIu8 ",", entry.identifier); - ChipLogProgress(Zcl, " name: %.*s,", static_cast(entry.name.size()), entry.name.data()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1725,51 +382,6 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1779,51 +391,6 @@ chip::Callback::Callback gTestCluster static void OnTestClusterListOctetStringListAttributeResponse(void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " %s,", ByteSpanToString(entry).c_str()); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1834,54 +401,6 @@ static void OnTestClusterListStructOctetStringListAttributeResponse( void * context, const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " fabricIndex: %" PRIu64 ",", entry.fabricIndex); - ChipLogProgress(Zcl, " operationalCert: %s,", ByteSpanToString(entry.operationalCert).c_str()); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -1892,112 +411,6 @@ static void OnTestClusterListNullablesAndOptionalsStructListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::TestCluster::Structs::NullablesAndOptionalsStruct::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - if (entry.nullableInt.IsNull()) { - ChipLogProgress(chipTool, " NullableInt: null"); - } else { - ChipLogProgress(Zcl, " NullableInt: %" PRIu16 ",", entry.nullableInt.Value()); - } - if (entry.optionalInt.HasValue()) { - ChipLogProgress(Zcl, " OptionalInt: %" PRIu16 ",", entry.optionalInt.Value()); - } - if (entry.nullableOptionalInt.HasValue()) { - if (entry.nullableOptionalInt.Value().IsNull()) { - ChipLogProgress(chipTool, " NullableOptionalInt: null"); - } else { - ChipLogProgress(Zcl, " NullableOptionalInt: %" PRIu16 ",", entry.nullableOptionalInt.Value().Value()); - } - } - if (entry.nullableString.IsNull()) { - ChipLogProgress(chipTool, " NullableString: null"); - } else { - ChipLogProgress(Zcl, " NullableString: %.*s,", static_cast(entry.nullableString.Value().size()), entry.nullableString.Value().data()); - } - if (entry.optionalString.HasValue()) { - ChipLogProgress(Zcl, " OptionalString: %.*s,", static_cast(entry.optionalString.Value().size()), entry.optionalString.Value().data()); - } - if (entry.nullableOptionalString.HasValue()) { - if (entry.nullableOptionalString.Value().IsNull()) { - ChipLogProgress(chipTool, " NullableOptionalString: null"); - } else { - ChipLogProgress(Zcl, " NullableOptionalString: %.*s,", static_cast(entry.nullableOptionalString.Value().Value().size()), entry.nullableOptionalString.Value().Value().data()); - } - } - if (entry.nullableStruct.IsNull()) { - ChipLogProgress(chipTool, " NullableStruct: null"); - } else { - ChipLogProgress(chipTool, " NullableStruct: struct member of struct element of list attribute printing not supported yet"); - } - if (entry.optionalStruct.HasValue()) { - ChipLogProgress(chipTool, " OptionalStruct: struct member of struct element of list attribute printing not supported yet"); - } - if (entry.nullableOptionalStruct.HasValue()) { - if (entry.nullableOptionalStruct.Value().IsNull()) { - ChipLogProgress(chipTool, " NullableOptionalStruct: null"); - } else { - ChipLogProgress(chipTool, " NullableOptionalStruct: struct member of struct element of list attribute printing not supported yet"); - } - } - if (entry.nullableList.IsNull()) { - ChipLogProgress(chipTool, " NullableList: null"); - } else { - ChipLogProgress(chipTool, " NullableList: list member of struct element of list attribute printing not supported yet"); - } - if (entry.optionalList.HasValue()) { - ChipLogProgress(chipTool, " OptionalList: list member of struct element of list attribute printing not supported yet"); - } - if (entry.nullableOptionalList.HasValue()) { - if (entry.nullableOptionalList.Value().IsNull()) { - ChipLogProgress(chipTool, " NullableOptionalList: null"); - } else { - ChipLogProgress(chipTool, " NullableOptionalList: list member of struct element of list attribute printing not supported yet"); - } - } - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -2010,66 +423,6 @@ static void OnThreadNetworkDiagnosticsNeighborTableListListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " ExtAddress: %" PRIu64 ",", entry.extAddress); - ChipLogProgress(Zcl, " Age: %" PRIu32 ",", entry.age); - ChipLogProgress(Zcl, " Rloc16: %" PRIu16 ",", entry.rloc16); - ChipLogProgress(Zcl, " LinkFrameCounter: %" PRIu32 ",", entry.linkFrameCounter); - ChipLogProgress(Zcl, " MleFrameCounter: %" PRIu32 ",", entry.mleFrameCounter); - ChipLogProgress(Zcl, " LQI: %" PRIu8 ",", entry.lqi); - ChipLogProgress(Zcl, " AverageRssi: %" PRId8 ",", entry.averageRssi); - ChipLogProgress(Zcl, " LastRssi: %" PRId8 ",", entry.lastRssi); - ChipLogProgress(Zcl, " FrameErrorRate: %" PRIu8 ",", entry.frameErrorRate); - ChipLogProgress(Zcl, " MessageErrorRate: %" PRIu8 ",", entry.messageErrorRate); - ChipLogProgress(Zcl, " RxOnWhenIdle: %d,", entry.rxOnWhenIdle); - ChipLogProgress(Zcl, " FullThreadDevice: %d,", entry.fullThreadDevice); - ChipLogProgress(Zcl, " FullNetworkData: %d,", entry.fullNetworkData); - ChipLogProgress(Zcl, " IsChild: %d,", entry.isChild); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -2082,62 +435,6 @@ static void OnThreadNetworkDiagnosticsRouteTableListListAttributeResponse( const chip::app::DataModel::DecodableList & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " ExtAddress: %" PRIu64 ",", entry.extAddress); - ChipLogProgress(Zcl, " Rloc16: %" PRIu16 ",", entry.rloc16); - ChipLogProgress(Zcl, " RouterId: %" PRIu8 ",", entry.routerId); - ChipLogProgress(Zcl, " NextHop: %" PRIu8 ",", entry.nextHop); - ChipLogProgress(Zcl, " PathCost: %" PRIu8 ",", entry.pathCost); - ChipLogProgress(Zcl, " LQIIn: %" PRIu8 ",", entry.LQIIn); - ChipLogProgress(Zcl, " LQIOut: %" PRIu8 ",", entry.LQIOut); - ChipLogProgress(Zcl, " Age: %" PRIu8 ",", entry.age); - ChipLogProgress(Zcl, " Allocated: %d,", entry.allocated); - ChipLogProgress(Zcl, " LinkEstablished: %d,", entry.linkEstablished); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -2149,54 +446,6 @@ static void OnThreadNetworkDiagnosticsSecurityPolicyListAttributeResponse( const chip::app::DataModel::DecodableList< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " RotationTime: %" PRIu16 ",", entry.rotationTime); - ChipLogProgress(Zcl, " Flags: %" PRIu16 ",", entry.flags); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -2208,64 +457,6 @@ static void OnThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeR const chip::app::DataModel::DecodableList< chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); - ChipLogProgress(Zcl, " {"); - ChipLogProgress(Zcl, " ActiveTimestampPresent: %d,", entry.activeTimestampPresent); - ChipLogProgress(Zcl, " PendingTimestampPresent: %d,", entry.pendingTimestampPresent); - ChipLogProgress(Zcl, " MasterKeyPresent: %d,", entry.masterKeyPresent); - ChipLogProgress(Zcl, " NetworkNamePresent: %d,", entry.networkNamePresent); - ChipLogProgress(Zcl, " ExtendedPanIdPresent: %d,", entry.extendedPanIdPresent); - ChipLogProgress(Zcl, " MeshLocalPrefixPresent: %d,", entry.meshLocalPrefixPresent); - ChipLogProgress(Zcl, " DelayPresent: %d,", entry.delayPresent); - ChipLogProgress(Zcl, " PanIdPresent: %d,", entry.panIdPresent); - ChipLogProgress(Zcl, " ChannelPresent: %d,", entry.channelPresent); - ChipLogProgress(Zcl, " PskcPresent: %d,", entry.pskcPresent); - ChipLogProgress(Zcl, " SecurityPolicyPresent: %d,", entry.securityPolicyPresent); - ChipLogProgress(Zcl, " ChannelMaskPresent: %d,", entry.channelMaskPresent); - ChipLogProgress(Zcl, " },"); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } @@ -2276,51 +467,6 @@ chip::Callback::Callback & list) { -<<<<<<< HEAD -#if 0 - // TODO this code is not really used right now, doesn't work with nullable lists, - // and is blocking new clusters from using nullable lists. Disable for now to unblock, - // until it can be fixed or removed entirely. - - size_t count = 0; - CHIP_ERROR err = list.ComputeSize(&count); - if (err != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - ChipLogProgress(Zcl, " attributeValue:%s", count > 0 ? "" : " []"); - - if (count > 0) - ChipLogProgress(Zcl, " ["); - - auto iter = list.begin(); - while (iter.Next()) - { -#if CHIP_PROGRESS_LOGGING - auto & entry = iter.GetValue(); -ChipLogProgress(Zcl, " %" PRIu8 ",", entry); -#endif // CHIP_PROGRESS_LOGGING - } - if (iter.GetStatus() != CHIP_NO_ERROR) - { - if (gFailureResponseDelegate != nullptr) - { - gFailureResponseDelegate(EMBER_ZCL_STATUS_INVALID_VALUE); - } - return; - } - - if (count > 0) - ChipLogProgress(Zcl, " ]"); -#endif - -======= ->>>>>>> master if (gSuccessResponseDelegate != nullptr) gSuccessResponseDelegate(); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index b07fdf53c63b35..ecbb2752f43d36 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -4466,7 +4466,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -4482,7 +4482,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0001 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -4498,7 +4498,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0xFFFC + return 0x0000FFFC @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -4514,7 +4514,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0xFFFD + return 0x0000FFFD @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: