Removed the LastConfiguredBy attribute in the cpp code

Author: lpbeliveau-silabs

src/app/clusters/scenes-server/SceneHandlerImpl.h

@@ -38,8 +38,8 @@ class DefaultSceneHandlerImpl : public scenes::SceneHandler
 
     using AttributeValuePairType          = app::Clusters::ScenesManagement::Structs::AttributeValuePairStruct::Type;
     using AttributeValuePairDecodableType = app::Clusters::ScenesManagement::Structs::AttributeValuePairStruct::DecodableType;
-    using ExtensionFieldSetDecodableType  = app::Clusters::ScenesManagement::Structs::ExtensionFieldSet::DecodableType;
-    using ExtensionFieldSetType           = app::Clusters::ScenesManagement::Structs::ExtensionFieldSet::Type;
+    using ExtensionFieldSetDecodableType  = app::Clusters::ScenesManagement::Structs::ExtensionFieldSetStruct::DecodableType;
+    using ExtensionFieldSetType           = app::Clusters::ScenesManagement::Structs::ExtensionFieldSetStruct::Type;
 
 public:
     /// @brief Struct meant to map the state of a cluster to a specific endpoint. Meant to be used to apply scenes using a timer for

src/app/clusters/scenes-server/SceneTable.h

@@ -79,14 +79,14 @@ class SceneHandler : public IntrusiveListNodeBase<>
     /// the supported ones.
     ///
     /// @param endpoint[in] Endpoint ID
-    /// @param extensionFieldSet[in] ExtensionFieldSets provided by the AddScene Command, pre initialized
-    /// @param serialisedBytes[out] Buffer to fill from the ExtensionFieldSet in command
+    /// @param extensionFieldSet[in] ExtensionFieldSetStruct provided by the AddScene Command, pre initialized
+    /// @param serialisedBytes[out] Buffer to fill from the ExtensionFieldSetStruct in command
     /// @return CHIP_NO_ERROR if successful, CHIP_ERROR value otherwise
     /// @note Only gets called after the scene-cluster has previously verified that the endpoint,cluster pair is supported by
     /// the handler. It is therefore the implementation's reponsibility to also implement the SupportsCluster method.
     virtual CHIP_ERROR
     SerializeAdd(EndpointId endpoint,
-                 const app::Clusters::ScenesManagement::Structs::ExtensionFieldSet::DecodableType & extensionFieldSet,
+                 const app::Clusters::ScenesManagement::Structs::ExtensionFieldSetStruct::DecodableType & extensionFieldSet,
                  MutableByteSpan & serialisedBytes) = 0;
 
     /// @brief Called when handling StoreScene, and only if the handler supports the given endpoint and cluster.
@@ -101,24 +101,24 @@ class SceneHandler : public IntrusiveListNodeBase<>
     /// @return CHIP_NO_ERROR if successful, CHIP_ERROR value otherwise
     virtual CHIP_ERROR SerializeSave(EndpointId endpoint, ClusterId cluster, MutableByteSpan & serializedBytes) = 0;
 
-    /// @brief Deserialize an ExtensionFieldSet into a cluster object (e.g. when handling ViewScene).
+    /// @brief Deserialize an ExtensionFieldSetStruct into a cluster object (e.g. when handling ViewScene).
     ///
     /// @param endpoint[in] Endpoint ID
     /// @param cluster[in] Cluster ID
-    /// @param serializedBytes[in] ExtensionFieldSet stored in NVM
+    /// @param serializedBytes[in] ExtensionFieldSetStruct stored in NVM
     ///
-    /// @param extensionFieldSet[out] ExtensionFieldSet in command format
+    /// @param extensionFieldSet[out] ExtensionFieldSetStruct in command format
     /// @return CHIP_NO_ERROR if successful, CHIP_ERROR value otherwise
     /// @note Only gets called for handlers for which SupportsCluster() is true for the given endpoint and cluster.
     virtual CHIP_ERROR Deserialize(EndpointId endpoint, ClusterId cluster, const ByteSpan & serializedBytes,
 
-                                   app::Clusters::ScenesManagement::Structs::ExtensionFieldSet::Type & extensionFieldSet) = 0;
+                                   app::Clusters::ScenesManagement::Structs::ExtensionFieldSetStruct::Type & extensionFieldSet) = 0;
 
     /// @brief Restore a stored scene for the given cluster instance, over timeMs milliseconds (e.g. when handling RecallScene)
     ///
     /// @param endpoint[in] Endpoint ID
     /// @param cluster[in] Cluster ID
-    /// @param serializedBytes[in] ExtensionFieldSet stored in NVM
+    /// @param serializedBytes[in] ExtensionFieldSetStruct stored in NVM
     ///
     /// @param timeMs[in] Transition time in ms to apply the scene
     /// @return CHIP_NO_ERROR if successful, CHIP_ERROR value otherwise

src/app/clusters/scenes-server/scenes-server.cpp

@@ -104,28 +104,6 @@ CHIP_ERROR AddResponseOnError(CommandHandlerInterface::HandlerContext & ctx, Res
     return AddResponseOnError(ctx, resp, StatusIB(status).ToChipError());
 }
 
-Status SetLastConfiguredBy(HandlerContext & ctx)
-{
-    const Access::SubjectDescriptor descriptor = ctx.mCommandHandler.GetSubjectDescriptor();
-
-    if (AuthMode::kCase == descriptor.authMode)
-    {
-        return Attributes::LastConfiguredBy::Set(ctx.mRequestPath.mEndpointId, descriptor.subject);
-    }
-
-    return Attributes::LastConfiguredBy::SetNull(ctx.mRequestPath.mEndpointId);
-}
-
-template <typename ResponseType>
-CHIP_ERROR UpdateLastConfiguredBy(HandlerContext & ctx, ResponseType resp)
-{
-    Status status = SetLastConfiguredBy(ctx);
-
-    // LastConfiguredBy is optional, so we don't want to fail the command if it fails to update
-    VerifyOrReturnValue(!(Status::Success == status || Status::UnsupportedAttribute == status), CHIP_NO_ERROR);
-    return AddResponseOnError(ctx, resp, status);
-}
-
 /// @brief Helper function to update the FabricSceneInfo attribute for a given Endpoint and fabric
 /// @param endpoint Endpoint to update
 /// @param fabric Fabric to update
@@ -471,8 +449,6 @@ void AddSceneParse(CommandHandlerInterface::HandlerContext & ctx, const CommandD
                            UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
                                                  Optional<GroupId>(), Optional<SceneId>(), Optional<bool>())));
 
-    ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
-
     // Write response
     response.status = to_underlying(Protocols::InteractionModel::Status::Success);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
@@ -521,7 +497,7 @@ void ViewSceneParse(HandlerContext & ctx, const CommandData & req, GroupDataProv
                                                                       SceneStorageId(req.sceneID, req.groupID), scene)));
 
     // Response Extension Field Sets buffer
-    Structs::ExtensionFieldSet::Type responseEFSBuffer[scenes::kMaxClustersPerScene];
+    Structs::ExtensionFieldSetStruct::Type responseEFSBuffer[scenes::kMaxClustersPerScene];
     uint8_t deserializedEFSCount = 0;
 
     // Adds extension field sets to the scene
@@ -550,8 +526,8 @@ void ViewSceneParse(HandlerContext & ctx, const CommandData & req, GroupDataProv
     response.transitionTime.SetValue(scene.mStorageData.mSceneTransitionTimeMs);
 
     response.sceneName.SetValue(CharSpan(scene.mStorageData.mName, scene.mStorageData.mNameLength));
-    Span<Structs::ExtensionFieldSet::Type> responseEFSSpan(responseEFSBuffer, deserializedEFSCount);
-    response.extensionFieldSets.SetValue(responseEFSSpan);
+    Span<Structs::ExtensionFieldSetStruct::Type> responseEFSSpan(responseEFSBuffer, deserializedEFSCount);
+    response.extensionFieldSetStructs.SetValue(responseEFSSpan);
 
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
 }
@@ -888,7 +864,6 @@ void ScenesServer::HandleRemoveScene(HandlerContext & ctx, const Commands::Remov
         sceneValid.Emplace(false);
     }
 
-    ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
     ReturnOnFailure(
         AddResponseOnError(ctx, response,
                            UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
@@ -942,8 +917,6 @@ void ScenesServer::HandleRemoveAllScenes(HandlerContext & ctx, const Commands::R
                            UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
                                                  Optional<GroupId>(), Optional<SceneId>(), sceneValid)));
 
-    ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
-
     // Write response
     response.status = to_underlying(Protocols::InteractionModel::Status::Success);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
@@ -970,8 +943,6 @@ void ScenesServer::HandleStoreScene(HandlerContext & ctx, const Commands::StoreS
                                      req.sceneID, mGroupProvider);
 
     ReturnOnFailure(AddResponseOnError(ctx, response, err));
-
-    ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
     response.status = to_underlying(Protocols::InteractionModel::Status::Success);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
 }
@@ -1135,8 +1106,6 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
                                       Optional<GroupId>(), Optional<SceneId>(), Optional<bool>() /* = sceneValid*/)));
         }
 
-        ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
-
         response.status = to_underlying(Protocols::InteractionModel::Status::Success);
         ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
         return;
@@ -1157,8 +1126,6 @@ void ScenesServer::HandleCopyScene(HandlerContext & ctx, const Commands::CopySce
                            UpdateFabricSceneInfo(ctx.mRequestPath.mEndpointId, ctx.mCommandHandler.GetAccessingFabricIndex(),
                                                  Optional<GroupId>(), Optional<SceneId>(), Optional<bool>())));
 
-    ReturnOnFailure(UpdateLastConfiguredBy(ctx, response));
-
     response.status = to_underlying(Protocols::InteractionModel::Status::Success);
     ctx.mCommandHandler.AddResponse(ctx.mRequestPath, response);
 }
@@ -1174,12 +1141,6 @@ using namespace chip::app::Clusters::ScenesManagement;
 
 void emberAfScenesManagementClusterServerInitCallback(EndpointId endpoint)
 {
-    Status status = Attributes::LastConfiguredBy::SetNull(endpoint);
-    if (Status::Success != status)
-    {
-        ChipLogDetail(Zcl, "ERR: setting LastConfiguredBy on Endpoint %hu Status: %x", endpoint, to_underlying(status));
-    }
-
     // Initialize the FabricSceneInfo by getting the number of scenes and the remaining capacity for storing fabric scene data
     for (auto & info : chip::Server::GetInstance().GetFabricTable())
     {