Rename CommandDataElement to CommandDataIB (#10695)
* Rename CommandDataElement to CommandDataIB
* run codegen
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 623f7be..5fa15d4 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -57,8 +57,8 @@
"MessageDef/AttributeStatusList.h",
"MessageDef/Builder.cpp",
"MessageDef/Builder.h",
- "MessageDef/CommandDataElement.cpp",
- "MessageDef/CommandDataElement.h",
+ "MessageDef/CommandDataIB.cpp",
+ "MessageDef/CommandDataIB.h",
"MessageDef/CommandList.cpp",
"MessageDef/CommandList.h",
"MessageDef/CommandPathIB.cpp",
diff --git a/src/app/Command.cpp b/src/app/Command.cpp
index e77540b..b2bdcb3 100644
--- a/src/app/Command.cpp
+++ b/src/app/Command.cpp
@@ -93,12 +93,12 @@
VerifyOrExit(chip::TLV::AnonymousTag == commandListReader.GetTag(), err = CHIP_ERROR_INVALID_TLV_TAG);
VerifyOrExit(chip::TLV::kTLVType_Structure == commandListReader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
- CommandDataElement::Parser commandElement;
+ CommandDataIB::Parser commandElement;
err = commandElement.Init(commandListReader);
SuccessOrExit(err);
- err = ProcessCommandDataElement(commandElement);
+ err = ProcessCommandDataIB(commandElement);
SuccessOrExit(err);
}
@@ -115,7 +115,7 @@
CHIP_ERROR Command::PrepareCommand(const CommandPathParams & aCommandPathParams, bool aStartDataStruct)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- CommandDataElement::Builder commandDataElement;
+ CommandDataIB::Builder commandDataIB;
err = AllocateBuffer();
SuccessOrExit(err);
@@ -125,17 +125,17 @@
//
VerifyOrExit(mState == CommandState::Idle, err = CHIP_ERROR_INCORRECT_STATE);
- commandDataElement = mInvokeCommandBuilder.GetCommandListBuilder().CreateCommandDataElementBuilder();
- err = commandDataElement.GetError();
+ commandDataIB = mInvokeCommandBuilder.GetCommandListBuilder().CreateCommandDataIBBuilder();
+ err = commandDataIB.GetError();
SuccessOrExit(err);
- err = ConstructCommandPath(aCommandPathParams, commandDataElement);
+ err = ConstructCommandPath(aCommandPathParams, commandDataIB);
SuccessOrExit(err);
if (aStartDataStruct)
{
- err = commandDataElement.GetWriter()->StartContainer(TLV::ContextTag(CommandDataElement::kCsTag_Data),
- TLV::kTLVType_Structure, mDataElementContainerType);
+ err = commandDataIB.GetWriter()->StartContainer(TLV::ContextTag(CommandDataIB::kCsTag_Data), TLV::kTLVType_Structure,
+ mDataElementContainerType);
}
MoveToState(CommandState::AddingCommand);
@@ -144,7 +144,7 @@
return err;
}
-TLV::TLVWriter * Command::GetCommandDataElementTLVWriter()
+TLV::TLVWriter * Command::GetCommandDataIBTLVWriter()
{
if (mState != CommandState::AddingCommand)
{
@@ -152,7 +152,7 @@
}
else
{
- return mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataElementBuilder().GetWriter();
+ return mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataIBBuilder().GetWriter();
}
}
@@ -168,13 +168,13 @@
VerifyOrReturnError(mState == CommandState::AddingCommand, err = CHIP_ERROR_INCORRECT_STATE);
- CommandDataElement::Builder commandDataElement = mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataElementBuilder();
+ CommandDataIB::Builder commandDataIB = mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataIBBuilder();
if (aEndDataStruct)
{
- ReturnErrorOnFailure(commandDataElement.GetWriter()->EndContainer(mDataElementContainerType));
+ ReturnErrorOnFailure(commandDataIB.GetWriter()->EndContainer(mDataElementContainerType));
}
- ReturnErrorOnFailure(commandDataElement.EndOfCommandDataElement().GetError());
+ ReturnErrorOnFailure(commandDataIB.EndOfCommandDataIB().GetError());
ReturnErrorOnFailure(mInvokeCommandBuilder.GetCommandListBuilder().EndOfCommandList().GetError());
ReturnErrorOnFailure(mInvokeCommandBuilder.EndOfInvokeCommand().GetError());
@@ -183,10 +183,9 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR Command::ConstructCommandPath(const CommandPathParams & aCommandPathParams,
- CommandDataElement::Builder aCommandDataElement)
+CHIP_ERROR Command::ConstructCommandPath(const CommandPathParams & aCommandPathParams, CommandDataIB::Builder aCommandDataIB)
{
- CommandPathIB::Builder commandPath = aCommandDataElement.CreateCommandPathBuilder();
+ CommandPathIB::Builder commandPath = aCommandDataIB.CreateCommandPathBuilder();
if (aCommandPathParams.mFlags.Has(CommandPathFlags::kEndpointIdValid))
{
commandPath.EndpointId(aCommandPathParams.mEndpointId);
diff --git a/src/app/Command.h b/src/app/Command.h
index 822fd0a..a4a75d3 100644
--- a/src/app/Command.h
+++ b/src/app/Command.h
@@ -27,7 +27,7 @@
#include <app/CommandPathParams.h>
#include <app/ConcreteCommandPath.h>
#include <app/InteractionModelDelegate.h>
-#include <app/MessageDef/CommandDataElement.h>
+#include <app/MessageDef/CommandDataIB.h>
#include <app/MessageDef/CommandList.h>
#include <app/MessageDef/InvokeCommand.h>
#include <lib/core/CHIPCore.h>
@@ -74,7 +74,7 @@
* A set of methods to construct command request or response payloads
*/
CHIP_ERROR PrepareCommand(const CommandPathParams & aCommandPathParams, bool aStartDataStruct = true);
- TLV::TLVWriter * GetCommandDataElementTLVWriter();
+ TLV::TLVWriter * GetCommandDataIBTLVWriter();
CHIP_ERROR FinishCommand(bool aEndDataStruct = true);
CHIP_ERROR Finalize(System::PacketBufferHandle & commandPacket);
@@ -102,7 +102,7 @@
*/
Messaging::ExchangeContext * GetExchangeContext() const { return mpExchangeCtx; }
- virtual CHIP_ERROR ProcessCommandDataElement(CommandDataElement::Parser & aCommandElement) = 0;
+ virtual CHIP_ERROR ProcessCommandDataIB(CommandDataIB::Parser & aCommandElement) = 0;
protected:
Command();
@@ -124,7 +124,7 @@
void MoveToState(const CommandState aTargetState);
CHIP_ERROR ProcessCommandMessage(System::PacketBufferHandle && payload, CommandRoleId aCommandRoleId);
- CHIP_ERROR ConstructCommandPath(const CommandPathParams & aCommandPathParams, CommandDataElement::Builder aCommandDataElement);
+ CHIP_ERROR ConstructCommandPath(const CommandPathParams & aCommandPathParams, CommandDataIB::Builder aCommandDataIB);
const char * GetStateStr() const;
InvokeCommand::Builder mInvokeCommandBuilder;
diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp
index 2b2ea46..2508204 100644
--- a/src/app/CommandHandler.cpp
+++ b/src/app/CommandHandler.cpp
@@ -88,7 +88,7 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR CommandHandler::ProcessCommandDataElement(CommandDataElement::Parser & aCommandElement)
+CHIP_ERROR CommandHandler::ProcessCommandDataIB(CommandDataIB::Parser & aCommandElement)
{
CHIP_ERROR err = CHIP_NO_ERROR;
CommandPathIB::Parser commandPath;
@@ -167,7 +167,7 @@
err = PrepareCommand(commandPathParams, false /* aStartDataStruct */);
SuccessOrExit(err);
- statusIBBuilder = mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataElementBuilder().CreateStatusIBBuilder();
+ statusIBBuilder = mInvokeCommandBuilder.GetCommandListBuilder().GetCommandDataIBBuilder().CreateStatusIBBuilder();
//
// TODO: Most of the callers are incorrectly passing SecureChannel as the protocol ID, when in fact, the status code provided
diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
index a58c3d6..01fb11d 100644
--- a/src/app/CommandHandler.h
+++ b/src/app/CommandHandler.h
@@ -26,7 +26,7 @@
#include <app/Command.h>
#include <app/ConcreteCommandPath.h>
-#include <app/MessageDef/CommandDataElement.h>
+#include <app/MessageDef/CommandDataIB.h>
#include <app/data-model/Encode.h>
#include <lib/core/CHIPCore.h>
#include <lib/core/CHIPTLV.h>
@@ -88,9 +88,9 @@
CHIP_ERROR AddResponseData(const ConcreteCommandPath & aRequestCommandPath, const CommandData & aData)
{
ReturnErrorOnFailure(PrepareResponse(aRequestCommandPath, CommandData::GetCommandId()));
- TLV::TLVWriter * writer = GetCommandDataElementTLVWriter();
+ TLV::TLVWriter * writer = GetCommandDataIBTLVWriter();
VerifyOrReturnError(writer != nullptr, CHIP_ERROR_INCORRECT_STATE);
- ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(CommandDataElement::kCsTag_Data), aData));
+ ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(CommandDataIB::kCsTag_Data), aData));
return FinishCommand(/* aEndDataStruct = */ false);
}
@@ -105,7 +105,7 @@
friend class TestCommandInteraction;
CHIP_ERROR SendCommandResponse();
- CHIP_ERROR ProcessCommandDataElement(CommandDataElement::Parser & aCommandElement) override;
+ CHIP_ERROR ProcessCommandDataIB(CommandDataIB::Parser & aCommandElement) override;
CHIP_ERROR PrepareResponse(const ConcreteCommandPath & aRequestCommandPath, CommandId aResponseCommand);
Callback * mpCallback = nullptr;
};
diff --git a/src/app/CommandSender.cpp b/src/app/CommandSender.cpp
index cd5d5a1..57677dc 100644
--- a/src/app/CommandSender.cpp
+++ b/src/app/CommandSender.cpp
@@ -113,7 +113,7 @@
}
}
-CHIP_ERROR CommandSender::ProcessCommandDataElement(CommandDataElement::Parser & aCommandElement)
+CHIP_ERROR CommandSender::ProcessCommandDataIB(CommandDataIB::Parser & aCommandElement)
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::ClusterId clusterId;
diff --git a/src/app/CommandSender.h b/src/app/CommandSender.h
index 934f52a..76452fd 100644
--- a/src/app/CommandSender.h
+++ b/src/app/CommandSender.h
@@ -129,9 +129,9 @@
CHIP_ERROR AddRequestData(const CommandPathParams & aCommandPath, const CommandDataT & aData)
{
ReturnErrorOnFailure(PrepareCommand(aCommandPath, /* aStartDataStruct = */ false));
- TLV::TLVWriter * writer = GetCommandDataElementTLVWriter();
+ TLV::TLVWriter * writer = GetCommandDataIBTLVWriter();
VerifyOrReturnError(writer != nullptr, CHIP_ERROR_INCORRECT_STATE);
- ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(CommandDataElement::kCsTag_Data), aData));
+ ReturnErrorOnFailure(DataModel::Encode(*writer, TLV::ContextTag(CommandDataIB::kCsTag_Data), aData));
return FinishCommand(/* aEndDataStruct = */ false);
}
@@ -171,7 +171,7 @@
//
void Close();
- CHIP_ERROR ProcessCommandDataElement(CommandDataElement::Parser & aCommandElement) override;
+ CHIP_ERROR ProcessCommandDataIB(CommandDataIB::Parser & aCommandElement) override;
Callback * mpCallback = nullptr;
Messaging::ExchangeManager * mpExchangeMgr = nullptr;
diff --git a/src/app/MessageDef/CommandDataElement.cpp b/src/app/MessageDef/CommandDataIB.cpp
similarity index 90%
rename from src/app/MessageDef/CommandDataElement.cpp
rename to src/app/MessageDef/CommandDataIB.cpp
index 7b6be4b..e42fe57 100644
--- a/src/app/MessageDef/CommandDataElement.cpp
+++ b/src/app/MessageDef/CommandDataIB.cpp
@@ -17,11 +17,11 @@
*/
/**
* @file
- * This file defines CommandDataElement parser and builder in CHIP interaction model
+ * This file defines CommandDataIB parser and builder in CHIP interaction model
*
*/
-#include "CommandDataElement.h"
+#include "CommandDataIB.h"
#include "MessageDefHelper.h"
@@ -36,7 +36,7 @@
namespace chip {
namespace app {
-CHIP_ERROR CommandDataElement::Parser::Init(const chip::TLV::TLVReader & aReader)
+CHIP_ERROR CommandDataIB::Parser::Init(const chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -52,7 +52,7 @@
}
CHIP_ERROR
-CommandDataElement::Parser::ParseData(chip::TLV::TLVReader & aReader, int aDepth) const
+CommandDataIB::Parser::ParseData(chip::TLV::TLVReader & aReader, int aDepth) const
{
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -223,14 +223,14 @@
}
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR CommandDataElement::Parser::CheckSchemaValidity() const
+CHIP_ERROR CommandDataIB::Parser::CheckSchemaValidity() const
{
CHIP_ERROR err = CHIP_NO_ERROR;
uint16_t TagPresenceMask = 0;
chip::TLV::TLVReader reader;
uint32_t tagNum = 0;
- PRETTY_PRINT("CommandDataElement =");
+ PRETTY_PRINT("CommandDataIB =");
PRETTY_PRINT("{");
// make a copy of the reader
@@ -321,7 +321,7 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR CommandDataElement::Parser::GetCommandPath(CommandPathIB::Parser * const apCommandPath) const
+CHIP_ERROR CommandDataIB::Parser::GetCommandPath(CommandPathIB::Parser * const apCommandPath) const
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::TLV::TLVReader reader;
@@ -340,7 +340,7 @@
return err;
}
-CHIP_ERROR CommandDataElement::Parser::GetData(chip::TLV::TLVReader * const apReader) const
+CHIP_ERROR CommandDataIB::Parser::GetData(chip::TLV::TLVReader * const apReader) const
{
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -353,7 +353,7 @@
return err;
}
-CHIP_ERROR CommandDataElement::Parser::GetStatusIB(StatusIB::Parser * const apStatusIB) const
+CHIP_ERROR CommandDataIB::Parser::GetStatusIB(StatusIB::Parser * const apStatusIB) const
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::TLV::TLVReader reader;
@@ -370,12 +370,12 @@
return err;
}
-CHIP_ERROR CommandDataElement::Builder::Init(chip::TLV::TLVWriter * const apWriter)
+CHIP_ERROR CommandDataIB::Builder::Init(chip::TLV::TLVWriter * const apWriter)
{
return InitAnonymousStructure(apWriter);
}
-CommandPathIB::Builder & CommandDataElement::Builder::CreateCommandPathBuilder()
+CommandPathIB::Builder & CommandDataIB::Builder::CreateCommandPathBuilder()
{
// skip if error has already been set
VerifyOrExit(CHIP_NO_ERROR == mError, mCommandPathBuilder.ResetError(mError));
@@ -387,7 +387,7 @@
return mCommandPathBuilder;
}
-StatusIB::Builder & CommandDataElement::Builder::CreateStatusIBBuilder()
+StatusIB::Builder & CommandDataIB::Builder::CreateStatusIBBuilder()
{
// skip if error has already been set
VerifyOrExit(CHIP_NO_ERROR == mError, mStatusIBBuilder.ResetError(mError));
@@ -399,7 +399,7 @@
return mStatusIBBuilder;
}
-CommandDataElement::Builder & CommandDataElement::Builder::EndOfCommandDataElement()
+CommandDataIB::Builder & CommandDataIB::Builder::EndOfCommandDataIB()
{
EndOfContainer();
diff --git a/src/app/MessageDef/CommandDataElement.h b/src/app/MessageDef/CommandDataIB.h
similarity index 92%
rename from src/app/MessageDef/CommandDataElement.h
rename to src/app/MessageDef/CommandDataIB.h
index 9cc61c3..f3175ca 100644
--- a/src/app/MessageDef/CommandDataElement.h
+++ b/src/app/MessageDef/CommandDataIB.h
@@ -17,7 +17,7 @@
*/
/**
* @file
- * This file defines CommandDataElement parser and builder in CHIP interaction model
+ * This file defines CommandDataIB parser and builder in CHIP interaction model
*
*/
@@ -38,7 +38,7 @@
namespace chip {
namespace app {
-namespace CommandDataElement {
+namespace CommandDataIB {
enum
{
kCsTag_CommandPath = 0,
@@ -52,7 +52,7 @@
/**
* @brief Initialize the parser object with TLVReader
*
- * @param [in] aReader A pointer to a TLVReader, which should point to the beginning of this CommandDataElement
+ * @param [in] aReader A pointer to a TLVReader, which should point to the beginning of this CommandDataIB
*
* @return #CHIP_NO_ERROR on success
*/
@@ -139,16 +139,16 @@
StatusIB::Builder & CreateStatusIBBuilder();
/**
- * @brief Mark the end of this CommandDataElement
+ * @brief Mark the end of this CommandDataIB
*
* @return A reference to *this
*/
- CommandDataElement::Builder & EndOfCommandDataElement();
+ CommandDataIB::Builder & EndOfCommandDataIB();
private:
CommandPathIB::Builder mCommandPathBuilder;
StatusIB::Builder mStatusIBBuilder;
};
-}; // namespace CommandDataElement
+}; // namespace CommandDataIB
}; // namespace app
}; // namespace chip
diff --git a/src/app/MessageDef/CommandList.cpp b/src/app/MessageDef/CommandList.cpp
index 0885a47..73f33c4 100644
--- a/src/app/MessageDef/CommandList.cpp
+++ b/src/app/MessageDef/CommandList.cpp
@@ -55,7 +55,7 @@
VerifyOrExit(chip::TLV::kTLVType_Structure == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
{
- CommandDataElement::Parser data;
+ CommandDataIB::Parser data;
err = data.Init(reader);
SuccessOrExit(err);
@@ -90,16 +90,16 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CommandDataElement::Builder & CommandList::Builder::CreateCommandDataElementBuilder()
+CommandDataIB::Builder & CommandList::Builder::CreateCommandDataIBBuilder()
{
// skip if error has already been set
- VerifyOrExit(CHIP_NO_ERROR == mError, mCommandDataElementBuilder.ResetError(mError));
+ VerifyOrExit(CHIP_NO_ERROR == mError, mCommandDataIBBuilder.ResetError(mError));
- mError = mCommandDataElementBuilder.Init(mpWriter);
+ mError = mCommandDataIBBuilder.Init(mpWriter);
exit:
- // on error, mCommandDataElementBuilder would be un-/partial initialized and cannot be used to write anything
- return mCommandDataElementBuilder;
+ // on error, mCommandDataIBBuilder would be un-/partial initialized and cannot be used to write anything
+ return mCommandDataIBBuilder;
}
CommandList::Builder & CommandList::Builder::EndOfCommandList()
diff --git a/src/app/MessageDef/CommandList.h b/src/app/MessageDef/CommandList.h
index d6ae732..3422ffe 100644
--- a/src/app/MessageDef/CommandList.h
+++ b/src/app/MessageDef/CommandList.h
@@ -23,7 +23,7 @@
#pragma once
-#include "CommandDataElement.h"
+#include "CommandDataIB.h"
#include "ListBuilder.h"
#include "ListParser.h"
@@ -62,16 +62,16 @@
{
public:
/**
- * @brief Initialize a CommandDataElement::Builder for writing into the TLV stream
+ * @brief Initialize a CommandDataIB::Builder for writing into the TLV stream
*
- * @return A reference to CommandDataElement::Builder
+ * @return A reference to CommandDataIB::Builder
*/
- CommandDataElement::Builder & CreateCommandDataElementBuilder();
+ CommandDataIB::Builder & CreateCommandDataIBBuilder();
/**
- * @return A reference to CommandDataElement::Builder
+ * @return A reference to CommandDataIB::Builder
*/
- CommandDataElement::Builder & GetCommandDataElementBuilder() { return mCommandDataElementBuilder; };
+ CommandDataIB::Builder & GetCommandDataIBBuilder() { return mCommandDataIBBuilder; };
/**
* @brief Mark the end of this CommandList
@@ -81,7 +81,7 @@
CommandList::Builder & EndOfCommandList();
private:
- CommandDataElement::Builder mCommandDataElementBuilder;
+ CommandDataIB::Builder mCommandDataIBBuilder;
};
}; // namespace CommandList
}; // namespace app
diff --git a/src/app/MessageDef/InvokeCommand.h b/src/app/MessageDef/InvokeCommand.h
index 2b5d537..763118a 100644
--- a/src/app/MessageDef/InvokeCommand.h
+++ b/src/app/MessageDef/InvokeCommand.h
@@ -31,7 +31,7 @@
#include <lib/support/logging/CHIPLogging.h>
#include "Builder.h"
-#include "CommandDataElement.h"
+#include "CommandDataIB.h"
#include "CommandList.h"
#include "Parser.h"
diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
index d56fd78..3ecc3ff 100644
--- a/src/app/clusters/account-login-server/account-login-server.cpp
+++ b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -42,7 +42,7 @@
ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->PutString(TLV::ContextTag(0), responseSetupPin));
SuccessOrExit(err = command->FinishCommand());
exit:
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
index 7c7bbf5..d47d2f4 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp
+++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -53,7 +53,7 @@
ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), response.status));
SuccessOrExit(err = writer->PutString(TLV::ContextTag(1), reinterpret_cast<const char *>(response.data)));
SuccessOrExit(err = command->FinishCommand());
diff --git a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
index 87b8665..df42d8d 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
@@ -145,7 +145,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), entry.logEntryId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), entry.timestamp));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), entry.eventType));
diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
index 0ecc396..98ae5a5 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
@@ -165,7 +165,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -214,7 +214,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), scheduleId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), userId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), zclStatus));
@@ -256,7 +256,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), zclStatus));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -298,7 +298,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -344,7 +344,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), scheduleId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), userId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), zclStatus));
@@ -386,7 +386,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -430,7 +430,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -474,7 +474,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), holidayScheduleId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), zclStatus));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), entry->localStartTime));
@@ -514,7 +514,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp
index a80a032..4cbfa24 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp
@@ -240,7 +240,7 @@
ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), userId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), user->type));
SuccessOrExit(err = commandObj->FinishCommand());
@@ -271,7 +271,7 @@
ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -317,7 +317,7 @@
ZCL_SET_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -372,7 +372,7 @@
ZCL_GET_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), userId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), user.status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), user.type));
@@ -420,7 +420,7 @@
ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -465,7 +465,7 @@
ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), static_cast<uint8_t>(0)));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -497,7 +497,7 @@
ZCL_SET_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -524,7 +524,7 @@
ZCL_GET_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), userId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), user.status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), user.type));
@@ -562,7 +562,7 @@
ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -589,7 +589,7 @@
ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), static_cast<uint8_t>(0)));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -687,7 +687,7 @@
ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), doorLocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -754,7 +754,7 @@
ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), doorUnlocked ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE));
SuccessOrExit(err = commandObj->FinishCommand());
}
@@ -951,7 +951,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = commandObj->FinishCommand());
}
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index f98377f..1242253 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -178,7 +178,7 @@
ZCL_ADD_GROUP_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = commandObj->FinishCommand());
@@ -222,7 +222,7 @@
ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = writer->PutString(TLV::ContextTag(2), reinterpret_cast<char *>(&groupName[1]), groupName[0]));
@@ -321,7 +321,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), static_cast<uint8_t>(0xff)));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), count));
SuccessOrExit(err = writer->PutBytes(TLV::ContextTag(2), list, listLen));
@@ -373,7 +373,7 @@
ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = commandObj->FinishCommand());
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
index 78e1762..0968048 100644
--- a/src/app/clusters/identify-server/identify-server.cpp
+++ b/src/app/clusters/identify-server/identify-server.cpp
@@ -263,7 +263,7 @@
VerifyOrExit(commandObj != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), identifyTime));
SuccessOrExit(err = commandObj->FinishCommand());
}
diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
index fad6834..b8fe5dd 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp
+++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -45,7 +45,7 @@
VerifyOrExit(command != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), keypadInputStatus));
SuccessOrExit(err = command->FinishCommand());
diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
index ec23fc2..cc44773 100644
--- a/src/app/clusters/media-playback-server/media-playback-server.cpp
+++ b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -86,7 +86,7 @@
VerifyOrExit(command != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), mediaPlaybackStatus));
SuccessOrExit(err = command->FinishCommand());
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index a6eb8bb..4d32aab 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -414,7 +414,7 @@
VerifyOrReturnError(commandObj != nullptr, CHIP_ERROR_INCORRECT_STATE);
ReturnErrorOnFailure(commandObj->PrepareCommand(cmdParams));
- writer = commandObj->GetCommandDataElementTLVWriter();
+ writer = commandObj->GetCommandDataIBTLVWriter();
ReturnErrorOnFailure(writer->Put(TLV::ContextTag(0), status));
if (status == EMBER_ZCL_NODE_OPERATIONAL_CERT_STATUS_SUCCESS)
{
diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp
index a69d803..9738091 100644
--- a/src/app/clusters/scenes/scenes.cpp
+++ b/src/app/clusters/scenes/scenes.cpp
@@ -284,7 +284,7 @@
ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), sceneId));
@@ -337,7 +337,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = commandObj->FinishCommand());
@@ -371,7 +371,7 @@
ZCL_STORE_SCENE_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), sceneId));
@@ -466,7 +466,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1),
static_cast<uint8_t>(EMBER_AF_PLUGIN_SCENES_TABLE_SIZE -
@@ -1070,7 +1070,7 @@
}
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), sceneId));
@@ -1126,7 +1126,7 @@
}
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = commandObj->PrepareCommand(cmdParams));
- VerifyOrExit((writer = commandObj->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), status));
SuccessOrExit(err = writer->Put(TLV::ContextTag(1), groupId));
SuccessOrExit(err = writer->Put(TLV::ContextTag(2), sceneId));
diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
index 31af1e8..b2f9632 100644
--- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp
+++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -46,7 +46,7 @@
(app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
SuccessOrExit(err = writer->Put(TLV::ContextTag(0), response.status));
SuccessOrExit(err = writer->PutString(TLV::ContextTag(1), reinterpret_cast<const char *>(response.data)));
SuccessOrExit(err = command->FinishCommand());
diff --git a/src/app/clusters/tv-channel-server/tv-channel-server.cpp b/src/app/clusters/tv-channel-server/tv-channel-server.cpp
index 93ee7ed..e0d373c 100644
--- a/src/app/clusters/tv-channel-server/tv-channel-server.cpp
+++ b/src/app/clusters/tv-channel-server/tv-channel-server.cpp
@@ -60,7 +60,7 @@
ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) };
TLV::TLVWriter * writer = nullptr;
SuccessOrExit(err = command->PrepareCommand(cmdParams));
- VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = command->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
// TODO: Enable this once struct as param is supported
// SuccessOrExit(err = writer->Put(TLV::ContextTag(0), channelInfo));
// EmberAfTvChannelErrorType. errorType
diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp
index 7dfbb74..ae9f803 100644
--- a/src/app/tests/TestCommandInteraction.cpp
+++ b/src/app/tests/TestCommandInteraction.cpp
@@ -94,7 +94,7 @@
aCommandPath.mCommandId, (chip::app::CommandPathFlags::kEndpointIdValid) };
apCommandObj->PrepareCommand(responseParams);
- chip::TLV::TLVWriter * writer = apCommandObj->GetCommandDataElementTLVWriter();
+ chip::TLV::TLVWriter * writer = apCommandObj->GetCommandDataIBTLVWriter();
writer->PutBoolean(chip::TLV::ContextTag(1), true);
apCommandObj->FinishCommand();
}
@@ -190,8 +190,8 @@
static void GenerateReceivedCommand(nlTestSuite * apSuite, void * apContext, System::PacketBufferHandle & aPayload,
bool aNeedCommandData, EndpointId aEndpointId = kTestEndpointId,
ClusterId aClusterId = kTestClusterId, CommandId aCommandId = kTestCommandId);
- static void AddCommandDataElement(nlTestSuite * apSuite, void * apContext, Command * apCommand, bool aNeedStatusCode,
- CommandId aCommandId = kTestCommandId);
+ static void AddCommandDataIB(nlTestSuite * apSuite, void * apContext, Command * apCommand, bool aNeedStatusCode,
+ CommandId aCommandId = kTestCommandId);
static void ValidateCommandHandlerWithSendCommand(nlTestSuite * apSuite, void * apContext, bool aNeedStatusCode);
};
@@ -227,19 +227,20 @@
CommandList::Builder commandList = invokeCommandBuilder.CreateCommandListBuilder();
NL_TEST_ASSERT(apSuite, invokeCommandBuilder.GetError() == CHIP_NO_ERROR);
- CommandDataElement::Builder commandDataElementBuilder = commandList.CreateCommandDataElementBuilder();
+ CommandDataIB::Builder commandDataIBBuilder = commandList.CreateCommandDataIBBuilder();
NL_TEST_ASSERT(apSuite, commandList.GetError() == CHIP_NO_ERROR);
- CommandPathIB::Builder commandPathBuilder = commandDataElementBuilder.CreateCommandPathBuilder();
- NL_TEST_ASSERT(apSuite, commandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+
+ CommandPathIB::Builder commandPathBuilder = commandDataIBBuilder.CreateCommandPathBuilder();
+ NL_TEST_ASSERT(apSuite, commandDataIBBuilder.GetError() == CHIP_NO_ERROR);
+
commandPathBuilder.EndpointId(aEndpointId).ClusterId(aClusterId).CommandId(aCommandId).EndOfCommandPath();
NL_TEST_ASSERT(apSuite, commandPathBuilder.GetError() == CHIP_NO_ERROR);
if (aNeedCommandData)
{
- chip::TLV::TLVWriter * pWriter = commandDataElementBuilder.GetWriter();
+ chip::TLV::TLVWriter * pWriter = commandDataIBBuilder.GetWriter();
chip::TLV::TLVType dummyType = chip::TLV::kTLVType_NotSpecified;
- err = pWriter->StartContainer(chip::TLV::ContextTag(CommandDataElement::kCsTag_Data), chip::TLV::kTLVType_Structure,
- dummyType);
+ err = pWriter->StartContainer(chip::TLV::ContextTag(CommandDataIB::kCsTag_Data), chip::TLV::kTLVType_Structure, dummyType);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
err = pWriter->PutBoolean(chip::TLV::ContextTag(1), true);
@@ -249,8 +250,8 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
- commandDataElementBuilder.EndOfCommandDataElement();
- NL_TEST_ASSERT(apSuite, commandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+ commandDataIBBuilder.EndOfCommandDataIB();
+ NL_TEST_ASSERT(apSuite, commandDataIBBuilder.GetError() == CHIP_NO_ERROR);
commandList.EndOfCommandList();
NL_TEST_ASSERT(apSuite, commandList.GetError() == CHIP_NO_ERROR);
@@ -262,8 +263,8 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
-void TestCommandInteraction::AddCommandDataElement(nlTestSuite * apSuite, void * apContext, Command * apCommand,
- bool aNeedStatusCode, CommandId aCommandId)
+void TestCommandInteraction::AddCommandDataIB(nlTestSuite * apSuite, void * apContext, Command * apCommand, bool aNeedStatusCode,
+ CommandId aCommandId)
{
CHIP_ERROR err = CHIP_NO_ERROR;
auto commandPathParams = MakeTestCommandPath(aCommandId);
@@ -281,7 +282,7 @@
err = apCommand->PrepareCommand(commandPathParams);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- chip::TLV::TLVWriter * writer = apCommand->GetCommandDataElementTLVWriter();
+ chip::TLV::TLVWriter * writer = apCommand->GetCommandDataIBTLVWriter();
err = writer->PutBoolean(chip::TLV::ContextTag(1), true);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -329,7 +330,7 @@
System::PacketBufferHandle buf = System::PacketBufferHandle::New(System::PacketBuffer::kMaxSize);
- AddCommandDataElement(apSuite, apContext, &commandSender, false);
+ AddCommandDataIB(apSuite, apContext, &commandSender, false);
err = commandSender.SendCommandRequest(kTestDeviceNodeId, gFabricIndex, Optional<SessionHandle>::Missing());
NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_NOT_CONNECTED);
@@ -384,7 +385,7 @@
TestExchangeDelegate delegate;
commandHandler.mpExchangeCtx->SetDelegate(&delegate);
- AddCommandDataElement(apSuite, apContext, &commandHandler, aNeedStatusCode);
+ AddCommandDataIB(apSuite, apContext, &commandHandler, aNeedStatusCode);
err = commandHandler.Finalize(commandPacket);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -505,7 +506,7 @@
mockCommandSenderDelegate.ResetCounter();
app::CommandSender commandSender(&mockCommandSenderDelegate, gExchangeManager);
- AddCommandDataElement(apSuite, apContext, &commandSender, false);
+ AddCommandDataIB(apSuite, apContext, &commandSender, false);
err = commandSender.SendCommandRequest(0, 0, Optional<SessionHandle>(ctx.GetSessionBobToAlice()));
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
NL_TEST_ASSERT(apSuite,
@@ -524,7 +525,7 @@
mockCommandSenderDelegate.ResetCounter();
app::CommandSender commandSender(&mockCommandSenderDelegate, gExchangeManager);
- AddCommandDataElement(apSuite, apContext, &commandSender, false, kTestCommandIdCommandSpecificResponse);
+ AddCommandDataIB(apSuite, apContext, &commandSender, false, kTestCommandIdCommandSpecificResponse);
err = commandSender.SendCommandRequest(0, 0, Optional<SessionHandle>(ctx.GetSessionBobToAlice()));
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
NL_TEST_ASSERT(apSuite,
@@ -543,7 +544,7 @@
mockCommandSenderDelegate.ResetCounter();
app::CommandSender commandSender(&mockCommandSenderDelegate, gExchangeManager);
- AddCommandDataElement(apSuite, apContext, &commandSender, false, kTestNonExistCommandId);
+ AddCommandDataIB(apSuite, apContext, &commandSender, false, kTestNonExistCommandId);
err = commandSender.SendCommandRequest(0, 0, Optional<SessionHandle>(ctx.GetSessionBobToAlice()));
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
NL_TEST_ASSERT(apSuite,
@@ -570,7 +571,7 @@
{
app::CommandSender commandSender(&mockCommandSenderDelegate, gExchangeManager);
- AddCommandDataElement(apSuite, apContext, &commandSender, false, kTestCommandIdCommandSpecificResponse);
+ AddCommandDataIB(apSuite, apContext, &commandSender, false, kTestCommandIdCommandSpecificResponse);
err = commandSender.SendCommandRequest(0, 0, Optional<SessionHandle>(ctx.GetSessionBobToAlice()));
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp
index 7e4076f..891b6e2 100644
--- a/src/app/tests/TestMessageDef.cpp
+++ b/src/app/tests/TestMessageDef.cpp
@@ -23,7 +23,7 @@
*/
#include <app/AppBuildConfig.h>
-#include <app/MessageDef/CommandDataElement.h>
+#include <app/MessageDef/CommandDataIB.h>
#include <app/MessageDef/CommandList.h>
#include <app/MessageDef/InvokeCommand.h>
#include <app/MessageDef/ReadRequest.h>
@@ -537,20 +537,19 @@
attributeDataVersionListParser.GetVersion(&version);
}
-void BuildCommandDataElement(nlTestSuite * apSuite, CommandDataElement::Builder & aCommandDataElementBuilder)
+void BuildCommandDataIB(nlTestSuite * apSuite, CommandDataIB::Builder & aCommandDataIBBuilder)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- CommandPathIB::Builder commandPathBuilder = aCommandDataElementBuilder.CreateCommandPathBuilder();
- NL_TEST_ASSERT(apSuite, aCommandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+ CommandPathIB::Builder commandPathBuilder = aCommandDataIBBuilder.CreateCommandPathBuilder();
+ NL_TEST_ASSERT(apSuite, aCommandDataIBBuilder.GetError() == CHIP_NO_ERROR);
BuildCommandPath(apSuite, commandPathBuilder);
// Construct command data
{
- chip::TLV::TLVWriter * pWriter = aCommandDataElementBuilder.GetWriter();
+ chip::TLV::TLVWriter * pWriter = aCommandDataIBBuilder.GetWriter();
chip::TLV::TLVType dummyType = chip::TLV::kTLVType_NotSpecified;
- err = pWriter->StartContainer(chip::TLV::ContextTag(CommandDataElement::kCsTag_Data), chip::TLV::kTLVType_Structure,
- dummyType);
+ err = pWriter->StartContainer(chip::TLV::ContextTag(CommandDataIB::kCsTag_Data), chip::TLV::kTLVType_Structure, dummyType);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
err = pWriter->PutBoolean(chip::TLV::ContextTag(1), true);
@@ -560,26 +559,26 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
- aCommandDataElementBuilder.EndOfCommandDataElement();
- NL_TEST_ASSERT(apSuite, aCommandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+ aCommandDataIBBuilder.EndOfCommandDataIB();
+ NL_TEST_ASSERT(apSuite, aCommandDataIBBuilder.GetError() == CHIP_NO_ERROR);
}
-void ParseCommandDataElement(nlTestSuite * apSuite, CommandDataElement::Parser & aCommandDataElementParser)
+void ParseCommandDataIB(nlTestSuite * apSuite, CommandDataIB::Parser & aCommandDataIBParser)
{
CHIP_ERROR err = CHIP_NO_ERROR;
CommandPathIB::Parser commandPathParser;
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
- err = aCommandDataElementParser.CheckSchemaValidity();
+ err = aCommandDataIBParser.CheckSchemaValidity();
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
#endif
- err = aCommandDataElementParser.GetCommandPath(&commandPathParser);
+ err = aCommandDataIBParser.GetCommandPath(&commandPathParser);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
{
chip::TLV::TLVReader reader;
bool val = false;
chip::TLV::TLVType container;
- aCommandDataElementParser.GetData(&reader);
+ aCommandDataIBParser.GetData(&reader);
err = reader.EnterContainer(container);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -594,41 +593,41 @@
}
}
-void BuildCommandDataElementWithStatusCode(nlTestSuite * apSuite, CommandDataElement::Builder & aCommandDataElementBuilder)
+void BuildCommandDataIBWithStatusCode(nlTestSuite * apSuite, CommandDataIB::Builder & aCommandDataIBBuilder)
{
- CommandPathIB::Builder commandPathBuilder = aCommandDataElementBuilder.CreateCommandPathBuilder();
- NL_TEST_ASSERT(apSuite, aCommandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+ CommandPathIB::Builder commandPathBuilder = aCommandDataIBBuilder.CreateCommandPathBuilder();
+ NL_TEST_ASSERT(apSuite, aCommandDataIBBuilder.GetError() == CHIP_NO_ERROR);
BuildCommandPath(apSuite, commandPathBuilder);
- StatusIB::Builder statusIBBuilder = aCommandDataElementBuilder.CreateStatusIBBuilder();
+ StatusIB::Builder statusIBBuilder = aCommandDataIBBuilder.CreateStatusIBBuilder();
NL_TEST_ASSERT(apSuite, statusIBBuilder.GetError() == CHIP_NO_ERROR);
BuildStatusIB(apSuite, statusIBBuilder);
- aCommandDataElementBuilder.EndOfCommandDataElement();
- NL_TEST_ASSERT(apSuite, aCommandDataElementBuilder.GetError() == CHIP_NO_ERROR);
+ aCommandDataIBBuilder.EndOfCommandDataIB();
+ NL_TEST_ASSERT(apSuite, aCommandDataIBBuilder.GetError() == CHIP_NO_ERROR);
}
-void ParseCommandDataElementWithStatusCode(nlTestSuite * apSuite, CommandDataElement::Parser & aCommandDataElementParser)
+void ParseCommandDataIBWithStatusCode(nlTestSuite * apSuite, CommandDataIB::Parser & aCommandDataIBParser)
{
CHIP_ERROR err = CHIP_NO_ERROR;
CommandPathIB::Parser commandPathParser;
StatusIB::Parser StatusIBParser;
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
- err = aCommandDataElementParser.CheckSchemaValidity();
+ err = aCommandDataIBParser.CheckSchemaValidity();
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
#endif
- err = aCommandDataElementParser.GetCommandPath(&commandPathParser);
+ err = aCommandDataIBParser.GetCommandPath(&commandPathParser);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- err = aCommandDataElementParser.GetStatusIB(&StatusIBParser);
+ err = aCommandDataIBParser.GetStatusIB(&StatusIBParser);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
void BuildCommandList(nlTestSuite * apSuite, CommandList::Builder & aCommandListBuilder)
{
- CommandDataElement::Builder commandDataElementBuilder = aCommandListBuilder.CreateCommandDataElementBuilder();
+ CommandDataIB::Builder commandDataIBBuilder = aCommandListBuilder.CreateCommandDataIBBuilder();
NL_TEST_ASSERT(apSuite, aCommandListBuilder.GetError() == CHIP_NO_ERROR);
- BuildCommandDataElement(apSuite, commandDataElementBuilder);
+ BuildCommandDataIB(apSuite, commandDataIBBuilder);
aCommandListBuilder.EndOfCommandList();
NL_TEST_ASSERT(apSuite, aCommandListBuilder.GetError() == CHIP_NO_ERROR);
@@ -1342,16 +1341,16 @@
ParseAttributeDataVersionList(apSuite, reader);
}
-void CommandDataElementTest(nlTestSuite * apSuite, void * apContext)
+void CommandDataIBTest(nlTestSuite * apSuite, void * apContext)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- CommandDataElement::Builder commandDataElementBuilder;
- CommandDataElement::Parser commandDataElementParser;
+ CommandDataIB::Builder commandDataIBBuilder;
+ CommandDataIB::Parser commandDataIBParser;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
- commandDataElementBuilder.Init(&writer);
- BuildCommandDataElement(apSuite, commandDataElementBuilder);
+ commandDataIBBuilder.Init(&writer);
+ BuildCommandDataIB(apSuite, commandDataIBBuilder);
chip::System::PacketBufferHandle buf;
err = writer.Finalize(&buf);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1362,20 +1361,20 @@
err = reader.Next();
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- commandDataElementParser.Init(reader);
- ParseCommandDataElement(apSuite, commandDataElementParser);
+ commandDataIBParser.Init(reader);
+ ParseCommandDataIB(apSuite, commandDataIBParser);
}
-void CommandDataElementWithStatusCodeTest(nlTestSuite * apSuite, void * apContext)
+void CommandDataIBWithStatusCodeTest(nlTestSuite * apSuite, void * apContext)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- CommandDataElement::Builder commandDataElementBuilder;
- CommandDataElement::Parser commandDataElementParser;
+ CommandDataIB::Builder commandDataIBBuilder;
+ CommandDataIB::Parser commandDataIBParser;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
- commandDataElementBuilder.Init(&writer);
- BuildCommandDataElementWithStatusCode(apSuite, commandDataElementBuilder);
+ commandDataIBBuilder.Init(&writer);
+ BuildCommandDataIBWithStatusCode(apSuite, commandDataIBBuilder);
chip::System::PacketBufferHandle buf;
err = writer.Finalize(&buf);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -1386,8 +1385,8 @@
err = reader.Next();
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- commandDataElementParser.Init(reader);
- ParseCommandDataElementWithStatusCode(apSuite, commandDataElementParser);
+ commandDataIBParser.Init(reader);
+ ParseCommandDataIBWithStatusCode(apSuite, commandDataIBParser);
}
void CommandListTest(nlTestSuite * apSuite, void * apContext)
@@ -1636,8 +1635,8 @@
NL_TEST_DEF("AttributeDataElementTest", AttributeDataElementTest),
NL_TEST_DEF("AttributeDataListTest", AttributeDataListTest),
NL_TEST_DEF("AttributeDataVersionListTest", AttributeDataVersionListTest),
- NL_TEST_DEF("CommandDataElementTest", CommandDataElementTest),
- NL_TEST_DEF("CommandDataElementWithStatusCodeTest", CommandDataElementWithStatusCodeTest),
+ NL_TEST_DEF("CommandDataIBTest", CommandDataIBTest),
+ NL_TEST_DEF("CommandDataIBWithStatusCodeTest", CommandDataIBWithStatusCodeTest),
NL_TEST_DEF("CommandListTest", CommandListTest),
NL_TEST_DEF("ReportDataTest", ReportDataTest),
NL_TEST_DEF("InvokeCommandTest", InvokeCommandTest),
diff --git a/src/app/tests/integration/chip_im_initiator.cpp b/src/app/tests/integration/chip_im_initiator.cpp
index ea48630..226691b 100644
--- a/src/app/tests/integration/chip_im_initiator.cpp
+++ b/src/app/tests/integration/chip_im_initiator.cpp
@@ -233,7 +233,7 @@
err = commandSender->PrepareCommand(commandPathParams);
SuccessOrExit(err);
- writer = commandSender->GetCommandDataElementTLVWriter();
+ writer = commandSender->GetCommandDataIBTLVWriter();
err = writer->Put(chip::TLV::ContextTag(1), effectIdentifier);
SuccessOrExit(err);
diff --git a/src/app/tests/integration/chip_im_responder.cpp b/src/app/tests/integration/chip_im_responder.cpp
index 2caf6de..4a8f6b5 100644
--- a/src/app/tests/integration/chip_im_responder.cpp
+++ b/src/app/tests/integration/chip_im_responder.cpp
@@ -91,7 +91,7 @@
ReturnOnFailure(apCommandObj->PrepareCommand(commandPathParams));
- writer = apCommandObj->GetCommandDataElementTLVWriter();
+ writer = apCommandObj->GetCommandDataIBTLVWriter();
ReturnOnFailure(writer->Put(chip::TLV::ContextTag(kTestFieldId1), kTestFieldValue1));
ReturnOnFailure(writer->Put(chip::TLV::ContextTag(kTestFieldId2), kTestFieldValue2));
diff --git a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
index f829d38..43ba748 100644
--- a/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
+++ b/src/app/zap-templates/templates/app/CHIPClusters-src.zapt
@@ -61,7 +61,7 @@
{{#chip_cluster_command_arguments_with_structs_expanded}}
{{#first}}
- VerifyOrExit((writer = sender->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+ VerifyOrExit((writer = sender->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
{{/first}}
// {{asLowerCamelCase label}}: {{asLowerCamelCase type}}
{{#if (isCharString type)}}
diff --git a/src/controller/python/chip/clusters/command.cpp b/src/controller/python/chip/clusters/command.cpp
index 571bf60..9d9b186 100644
--- a/src/controller/python/chip/clusters/command.cpp
+++ b/src/controller/python/chip/clusters/command.cpp
@@ -125,7 +125,7 @@
SuccessOrExit(err = sender->PrepareCommand(cmdParams));
{
- auto writer = sender->GetCommandDataElementTLVWriter();
+ auto writer = sender->GetCommandDataIBTLVWriter();
TLV::TLVReader reader;
TLV::TLVType type;
VerifyOrExit(writer != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
