mirror of
https://github.com/espressif/openthread.git
synced 2026-06-05 21:14:49 +00:00
[logging] add support for per-instance log levels (#12740)
This commit introduces the ability to set and manage log levels on a per-instance basis when dynamic logging is enabled, while maintaining backward compatibility with existing logging behaviors. The existing `otLoggingGetLevel()` and `otLoggingSetLevel()` APIs are repurposed to manage the "global" log level. They continue to behave exactly as before in both single-instance and multi-instance configurations, ensuring that existing users of these APIs do not need to change their implementations. To provide more granular control, new APIs `otGetLogLevel()` and `otSetLogLevel()` are added to handle per-instance log levels. Specifically, this commit makes the following changes: - Adds `mLogLevel` to `Instance` to track the instance-specific log level. - Renames the global log level static variable to `sGlobalLogLevel` and introduces `GetGlobalLogLevel()` and `SetGlobalLogLevel()` to manage it in a multi-instance configuration. - Updates `otGetLogLevel()` and `otSetLogLevel()` APIs to handle per-instance log level retrieval and configuration. If a specific level is not set for an instance, it falls back to the global log level. - Adds `mIsLogLevelSet` to distinguish between an explicitly set instance log level and the global fallback in multi-instance builds. - Introduces `otPlatLogHandleLogLevelChanged()` platform callback to notify the platform when an instance-specific log level is updated. - Updates Nexus tests to use `SetGlobalLogLevel()` instead of the deprecated instance `SetLogLevel()` method.
This commit is contained in:
committed by
GitHub
parent
497e82ad5a
commit
cb4b28313b
@@ -52,7 +52,7 @@ extern "C" {
|
||||
*
|
||||
* @note This number versions both OpenThread platform and user APIs.
|
||||
*/
|
||||
#define OPENTHREAD_API_VERSION (585)
|
||||
#define OPENTHREAD_API_VERSION (586)
|
||||
|
||||
/**
|
||||
* @addtogroup api-instance
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include <openthread/error.h>
|
||||
#include <openthread/instance.h>
|
||||
#include <openthread/platform/logging.h>
|
||||
#include <openthread/platform/toolchain.h>
|
||||
|
||||
@@ -56,23 +57,68 @@ extern "C" {
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns the current log level.
|
||||
* Returns the current log level for a given OpenThread instance.
|
||||
*
|
||||
* If dynamic log level feature `OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE` is enabled, this function returns the
|
||||
* currently set dynamic log level. Otherwise, this function returns the build-time configured log level.
|
||||
* currently set dynamic log level:
|
||||
* - In a single-instance configuration, it returns the instance's log level.
|
||||
* - In a multi-instance configuration, it returns the instance-specific log level if it has been explicitly set
|
||||
* (see `otSetLogLevel()`). Otherwise, it returns the global log level (see `otLoggingGetLevel()`).
|
||||
*
|
||||
* If the dynamic log level feature is not enabled, this function returns the build-time configured log level.
|
||||
*
|
||||
* @param[in] aInstance The OpenThread instance.
|
||||
*
|
||||
* @returns The log level.
|
||||
*/
|
||||
otLogLevel otGetLogLevel(otInstance *aInstance);
|
||||
|
||||
/**
|
||||
* Sets the log level for a given OpenThread instance.
|
||||
*
|
||||
* @note This function requires `OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1`.
|
||||
*
|
||||
* In a single-instance configuration, this function sets the log level for the instance.
|
||||
*
|
||||
* In a multi-instance configuration (`OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE`), if
|
||||
* `OPENTHREAD_CONFIG_LOG_INSTANCE_AWARE_API_ENABLE` is not enabled, this function returns `OT_ERROR_NOT_CAPABLE`.
|
||||
* When the log level is explicitly set on an instance, it overrides the global log level set using
|
||||
* `otLoggingSetLevel()`.
|
||||
*
|
||||
* @param[in] aInstance The OpenThread instance.
|
||||
* @param[in] aLogLevel The log level.
|
||||
*
|
||||
* @retval OT_ERROR_NONE Successfully updated the log level.
|
||||
* @retval OT_ERROR_INVALID_ARGS Log level value is invalid.
|
||||
* @retval OT_ERROR_NOT_CAPABLE Instance-aware logging is not enabled in a multi-instance configuration.
|
||||
*/
|
||||
otError otSetLogLevel(otInstance *aInstance, otLogLevel aLogLevel);
|
||||
|
||||
/**
|
||||
* Returns the current global log level.
|
||||
*
|
||||
* In a single-instance configuration, this function behaves the same as `otGetLogLevel()`.
|
||||
* In a multi-instance configuration, it returns the global log level which is used for all instances.
|
||||
*
|
||||
* @returns The global log level.
|
||||
*/
|
||||
otLogLevel otLoggingGetLevel(void);
|
||||
|
||||
/**
|
||||
* Sets the log level.
|
||||
* Sets the global log level.
|
||||
*
|
||||
* @note This function requires `OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1`.
|
||||
*
|
||||
* In a single-instance configuration, this function behaves the same as `otSetLogLevel()` (which is the recommended
|
||||
* function to use).
|
||||
*
|
||||
* In a multi-instance configuration, it sets the global log level which is used by all instances. The log level can
|
||||
* be explicitly set on a specific instance using `otSetLogLevel()`, which will then be used instead of the global
|
||||
* value.
|
||||
*
|
||||
* @param[in] aLogLevel The log level.
|
||||
*
|
||||
* @retval OT_ERROR_NONE Successfully updated log level.
|
||||
* @retval OT_ERROR_NONE Successfully updated the log level.
|
||||
* @retval OT_ERROR_INVALID_ARGS Log level value is invalid.
|
||||
*/
|
||||
otError otLoggingSetLevel(otLogLevel aLogLevel);
|
||||
|
||||
@@ -175,8 +175,11 @@ void otPlatLogOutput(otInstance *aInstance, otLogLevel aLogLevel, const char *aL
|
||||
/**
|
||||
* Handles OpenThread log level changes.
|
||||
*
|
||||
* This platform function is called whenever the OpenThread log level changes.
|
||||
* This platform function is optional since an empty weak implementation has been provided.
|
||||
* This platform function is optional. An empty weak implementation is provided by OpenThread core.
|
||||
*
|
||||
* This platform function is called whenever the OpenThread log level changes:
|
||||
* - In a single-instance configuration, this is called when the log level changes.
|
||||
* - In a multi-instance configuration, this is called when the global log level changes.
|
||||
*
|
||||
* @note Only applicable when `OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1`.
|
||||
*
|
||||
@@ -184,6 +187,21 @@ void otPlatLogOutput(otInstance *aInstance, otLogLevel aLogLevel, const char *aL
|
||||
*/
|
||||
void otPlatLogHandleLevelChanged(otLogLevel aLogLevel);
|
||||
|
||||
/**
|
||||
* Handles OpenThread instance-specific log level changes.
|
||||
*
|
||||
* This platform function is optional. An empty weak implementation is provided by OpenThread core.
|
||||
*
|
||||
* This platform function is called whenever the instance-specific log level changes:
|
||||
* - In a single-instance configuration, this is called along with `otPlatLogHandleLevelChanged()`.
|
||||
* - In a multi-instance configuration, if `OPENTHREAD_CONFIG_LOG_INSTANCE_AWARE_API_ENABLE` is used, this is called
|
||||
* when the instance-specific log level changes.
|
||||
*
|
||||
* @param[in] aInstance A pointer to the OpenThread instance.
|
||||
* @param[in] aLogLevel The new OpenThread log level for the instance.
|
||||
*/
|
||||
void otPlatLogHandleLogLevelChanged(otInstance *aInstance, otLogLevel aLogLevel);
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
||||
+4
-4
@@ -3033,13 +3033,13 @@ template <> otError Interpreter::Process<Cmd("log")>(Arg aArgs[])
|
||||
* @endcode
|
||||
* @par
|
||||
* Get the log level.
|
||||
* @sa otLoggingGetLevel
|
||||
* @sa otGetLogLevel
|
||||
*/
|
||||
if (aArgs[0] == "level")
|
||||
{
|
||||
if (aArgs[1].IsEmpty())
|
||||
{
|
||||
OutputLine("%d", otLoggingGetLevel());
|
||||
OutputLine("%u", otGetLogLevel(GetInstancePtr()));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3053,12 +3053,12 @@ template <> otError Interpreter::Process<Cmd("log")>(Arg aArgs[])
|
||||
* Done
|
||||
* @endcode
|
||||
* @par api_copy
|
||||
* #otLoggingSetLevel
|
||||
* #otSetLogLevel
|
||||
* @cparam log level @ca{level}
|
||||
*/
|
||||
VerifyOrExit(aArgs[2].IsEmpty(), error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(level));
|
||||
error = otLoggingSetLevel(static_cast<otLogLevel>(level));
|
||||
error = otSetLogLevel(GetInstancePtr(), static_cast<otLogLevel>(level));
|
||||
#else
|
||||
error = OT_ERROR_INVALID_ARGS;
|
||||
#endif
|
||||
|
||||
@@ -37,20 +37,43 @@
|
||||
|
||||
using namespace ot;
|
||||
|
||||
otLogLevel otLoggingGetLevel(void) { return static_cast<otLogLevel>(Instance::GetLogLevel()); }
|
||||
otLogLevel otGetLogLevel(otInstance *aInstance) { return MapEnum(AsCoreType(aInstance).GetLogLevel()); }
|
||||
|
||||
otLogLevel otLoggingGetLevel(void)
|
||||
{
|
||||
LogLevel level;
|
||||
|
||||
#if !OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
level = Instance::Get().GetLogLevel();
|
||||
#else
|
||||
level = Instance::GetGlobalLogLevel();
|
||||
#endif
|
||||
|
||||
return MapEnum(level);
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
otError otSetLogLevel(otInstance *aInstance, otLogLevel aLogLevel)
|
||||
{
|
||||
return AsCoreType(aInstance).SetLogLevel(MapEnum(aLogLevel));
|
||||
}
|
||||
|
||||
otError otLoggingSetLevel(otLogLevel aLogLevel)
|
||||
{
|
||||
Error error = kErrorNone;
|
||||
Error error;
|
||||
LogLevel level = MapEnum(aLogLevel);
|
||||
|
||||
VerifyOrExit(aLogLevel <= kLogLevelDebg && aLogLevel >= kLogLevelNone, error = kErrorInvalidArgs);
|
||||
Instance::SetLogLevel(static_cast<LogLevel>(aLogLevel));
|
||||
#if !OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
error = Instance::Get().SetLogLevel(level);
|
||||
#else
|
||||
error = Instance::SetGlobalLogLevel(level);
|
||||
#endif
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
static const char kPlatformModuleName[] = "Platform";
|
||||
|
||||
|
||||
+14
-1
@@ -139,9 +139,22 @@ void Logger::Log(const char *aModuleName, LogLevel aLogLevel, Error aError, cons
|
||||
#endif
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
VerifyOrExit(Instance::GetLogLevel() >= aLogLevel);
|
||||
|
||||
#if !OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
VerifyOrExit(Instance::Get().GetLogLevel() >= aLogLevel);
|
||||
#elif !OPENTHREAD_CONFIG_LOG_INSTANCE_AWARE_API_ENABLE
|
||||
VerifyOrExit(Instance::GetGlobalLogLevel() >= aLogLevel);
|
||||
#else
|
||||
{
|
||||
Instance *instance = Instance::GetActiveInstance();
|
||||
|
||||
VerifyOrExit(instance != nullptr);
|
||||
VerifyOrExit(instance->GetLogLevel() >= aLogLevel);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL
|
||||
{
|
||||
static const char kLevelChars[] = {
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <openthread/platform/logging.h>
|
||||
#include <openthread/platform/toolchain.h>
|
||||
|
||||
#include "common/as_core_type.hpp"
|
||||
#include "common/error.hpp"
|
||||
|
||||
namespace ot {
|
||||
@@ -460,6 +461,8 @@ typedef otLogHexDumpInfo HexDumpInfo; ///< Represents the hex dump info.
|
||||
*/
|
||||
Error GenerateNextHexDumpLine(HexDumpInfo &aInfo);
|
||||
|
||||
DefineMapEnum(otLogLevel, LogLevel);
|
||||
|
||||
} // namespace ot
|
||||
|
||||
#endif // OT_CORE_COMMON_LOG_HPP_
|
||||
|
||||
@@ -73,8 +73,8 @@ Utils::Heap *Instance::sHeap{nullptr};
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
LogLevel Instance::sLogLevel = static_cast<LogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL_INIT);
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE && OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
LogLevel Instance::sGlobalLogLevel = static_cast<LogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL_INIT);
|
||||
#endif
|
||||
|
||||
Instance::Instance(void)
|
||||
@@ -316,6 +316,13 @@ Instance::Instance(void)
|
||||
#endif
|
||||
#if OPENTHREAD_CONFIG_POWER_CALIBRATION_ENABLE && OPENTHREAD_CONFIG_PLATFORM_POWER_CALIBRATION_ENABLE
|
||||
, mPowerCalibration(*this)
|
||||
#endif
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
, mLogLevel(static_cast<LogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL_INIT))
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
, mIsLogLevelSet(false)
|
||||
#else
|
||||
#endif
|
||||
#endif
|
||||
, mIsInitialized(false)
|
||||
, mId(Random::NonCrypto::GetUint32())
|
||||
@@ -578,17 +585,53 @@ void Instance::ResetBufferInfo(void) { Get<MessagePool>().ResetMaxUsedBufferCoun
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
void Instance::SetLogLevel(LogLevel aLogLevel)
|
||||
Error Instance::SetLogLevel(LogLevel aLogLevel)
|
||||
{
|
||||
if (aLogLevel != sLogLevel)
|
||||
Error error = kErrorNone;
|
||||
|
||||
VerifyOrExit(aLogLevel <= kLogLevelDebg, error = kErrorInvalidArgs);
|
||||
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE && !OPENTHREAD_CONFIG_LOG_INSTANCE_AWARE_API_ENABLE
|
||||
ExitNow(error = kErrorNotCapable);
|
||||
#else
|
||||
VerifyOrExit(mLogLevel != aLogLevel);
|
||||
mLogLevel = aLogLevel;
|
||||
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
mIsLogLevelSet = true;
|
||||
#else
|
||||
otPlatLogHandleLevelChanged(mLogLevel);
|
||||
#endif
|
||||
otPlatLogHandleLogLevelChanged(this, mLogLevel);
|
||||
#endif
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
Error Instance::SetGlobalLogLevel(LogLevel aLogLevel)
|
||||
{
|
||||
sLogLevel = aLogLevel;
|
||||
otPlatLogHandleLevelChanged(sLogLevel);
|
||||
}
|
||||
Error error = kErrorNone;
|
||||
|
||||
VerifyOrExit(aLogLevel <= kLogLevelDebg, error = kErrorInvalidArgs);
|
||||
VerifyOrExit(sGlobalLogLevel != aLogLevel);
|
||||
sGlobalLogLevel = aLogLevel;
|
||||
otPlatLogHandleLevelChanged(sGlobalLogLevel);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
#endif
|
||||
|
||||
extern "C" OT_TOOL_WEAK void otPlatLogHandleLevelChanged(otLogLevel aLogLevel) { OT_UNUSED_VARIABLE(aLogLevel); }
|
||||
|
||||
#endif
|
||||
extern "C" OT_TOOL_WEAK void otPlatLogHandleLogLevelChanged(otInstance *aInstance, otLogLevel aLogLevel)
|
||||
{
|
||||
OT_UNUSED_VARIABLE(aInstance);
|
||||
OT_UNUSED_VARIABLE(aLogLevel);
|
||||
}
|
||||
|
||||
#endif // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
} // namespace ot
|
||||
|
||||
@@ -317,14 +317,30 @@ public:
|
||||
*
|
||||
* @returns The log level.
|
||||
*/
|
||||
static LogLevel GetLogLevel(void)
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
{
|
||||
return sLogLevel;
|
||||
}
|
||||
#else
|
||||
LogLevel GetLogLevel(void) const
|
||||
{
|
||||
#if !OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
return static_cast<LogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL);
|
||||
#elif !OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
return mLogLevel;
|
||||
#else
|
||||
return (mIsLogLevelSet) ? mLogLevel : sGlobalLogLevel;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
/**
|
||||
* Returns the global log level.
|
||||
*
|
||||
* @returns The global log level.
|
||||
*/
|
||||
static LogLevel GetGlobalLogLevel(void)
|
||||
{
|
||||
#if !OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
return static_cast<LogLevel>(OPENTHREAD_CONFIG_LOG_LEVEL);
|
||||
#else
|
||||
return sGlobalLogLevel;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -333,9 +349,25 @@ public:
|
||||
* Sets the log level.
|
||||
*
|
||||
* @param[in] aLogLevel A log level.
|
||||
*
|
||||
* @retval kErrorNone Successfully updated the log level.
|
||||
* @retval kErrorInvalidArgs The given log level is invalid.
|
||||
* @retval kErrorNotCapable Instance-aware logging is not enabled in a multi-instance configuration.
|
||||
*/
|
||||
static void SetLogLevel(LogLevel aLogLevel);
|
||||
Error SetLogLevel(LogLevel aLogLevel);
|
||||
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
/**
|
||||
* Sets the global log level.
|
||||
*
|
||||
* @param[in] aLogLevel A log level.
|
||||
*
|
||||
* @retval kErrorNone Successfully updated the log level.
|
||||
* @retval kErrorInvalidArgs The given log level is invalid.
|
||||
*/
|
||||
static Error SetGlobalLogLevel(LogLevel aLogLevel);
|
||||
#endif
|
||||
#endif // OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
|
||||
/**
|
||||
* Finalizes the OpenThread instance.
|
||||
@@ -461,8 +493,8 @@ private:
|
||||
//-----------------------------------------------------------------------------------------------------------------
|
||||
// `static` variables
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
static LogLevel sLogLevel;
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE && OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
static LogLevel sGlobalLogLevel;
|
||||
#endif
|
||||
|
||||
#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
|
||||
@@ -796,6 +828,13 @@ private:
|
||||
Utils::PowerCalibration mPowerCalibration;
|
||||
#endif
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
LogLevel mLogLevel;
|
||||
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
|
||||
bool mIsLogLevelSet;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
bool mIsInitialized;
|
||||
|
||||
uint32_t mId;
|
||||
|
||||
@@ -1547,7 +1547,7 @@ void MeshForwarder::LogMessage(MessageAction aAction,
|
||||
break;
|
||||
}
|
||||
|
||||
VerifyOrExit(Instance::GetLogLevel() >= logLevel);
|
||||
VerifyOrExit(GetInstance().GetLogLevel() >= logLevel);
|
||||
|
||||
switch (aMessage.GetType())
|
||||
{
|
||||
|
||||
@@ -361,7 +361,7 @@ void RadioSelector::Log(LogLevel aLogLevel,
|
||||
String<kRadioPreferenceStringSize> preferenceString;
|
||||
bool isFirstEntry = true;
|
||||
|
||||
VerifyOrExit(Instance::GetLogLevel() >= aLogLevel);
|
||||
VerifyOrExit(GetInstance().GetLogLevel() >= aLogLevel);
|
||||
|
||||
for (Mac::RadioType radio : sRadioSelectionOrder)
|
||||
{
|
||||
|
||||
@@ -2589,7 +2589,7 @@ template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_DEBUG_TEST_WATCHDOG>(
|
||||
|
||||
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_DEBUG_NCP_LOG_LEVEL>(void)
|
||||
{
|
||||
return mEncoder.WriteUint8(ConvertLogLevel(otLoggingGetLevel()));
|
||||
return mEncoder.WriteUint8(ConvertLogLevel(otGetLogLevel(mInstance)));
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE
|
||||
@@ -2633,7 +2633,7 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_DEBUG_NCP_LOG_LEVEL>(
|
||||
ExitNow(error = OT_ERROR_INVALID_ARGS);
|
||||
}
|
||||
|
||||
IgnoreError(otLoggingSetLevel(logLevel));
|
||||
IgnoreError(otSetLogLevel(mInstance, logLevel));
|
||||
|
||||
exit:
|
||||
return error;
|
||||
|
||||
@@ -107,7 +107,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
otCliInit(&node.GetInstance(), CliOutput, nullptr);
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
node.GetInstance().Get<BorderRouter::InfraIf>().Init(/* aInfraIfIndex */ 1, /* aInfraIfIsRunning */ true);
|
||||
SuccessOrQuit(node.GetInstance().Get<BorderRouter::RoutingManager>().SetEnabled(true));
|
||||
|
||||
@@ -110,7 +110,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
node.GetInstance().Get<BorderRouter::InfraIf>().Init(/* aInfraIfIndex */ 1, /* aInfraIfIsRunning */ true);
|
||||
SuccessOrQuit(node.GetInstance().Get<BorderRouter::RoutingManager>().SetEnabled(true));
|
||||
|
||||
@@ -109,7 +109,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
node.GetInstance().Get<BorderRouter::InfraIf>().Init(/* aInfraIfIndex */ 1, /* aInfraIfIsRunning */ true);
|
||||
SuccessOrQuit(node.GetInstance().Get<BorderRouter::RoutingManager>().SetEnabled(true));
|
||||
|
||||
@@ -108,7 +108,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
node.GetInstance().Get<BorderRouter::InfraIf>().Init(/* aInfraIfIndex */ 1, /* aInfraIfIsRunning */ true);
|
||||
SuccessOrQuit(node.GetInstance().Get<BorderRouter::RoutingManager>().SetEnabled(true));
|
||||
|
||||
@@ -99,7 +99,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
|
||||
|
||||
Node &node = nexus.CreateNode();
|
||||
|
||||
node.GetInstance().SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(node.GetInstance().SetLogLevel(kLogLevelInfo));
|
||||
|
||||
node.GetInstance().Get<BorderRouter::InfraIf>().Init(/* aInfraIfIndex */ 1, /* aInfraIfIsRunning */ true);
|
||||
SuccessOrQuit(node.GetInstance().Get<BorderRouter::RoutingManager>().SetEnabled(true));
|
||||
|
||||
@@ -75,7 +75,7 @@ void Test5_1_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Leader forms network");
|
||||
|
||||
@@ -95,7 +95,7 @@ void Test5_1_10(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Leader, Router_1, Router_2");
|
||||
|
||||
@@ -87,7 +87,7 @@ void Test5_1_12(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Ensure topology is formed correctly.");
|
||||
|
||||
@@ -106,7 +106,7 @@ void Test5_1_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
/**
|
||||
* Step 1: Router_2
|
||||
|
||||
@@ -95,7 +95,7 @@ void Test5_1_4(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
/**
|
||||
* Step 1: Router_2
|
||||
|
||||
@@ -84,7 +84,7 @@ void Test5_1_5(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -78,7 +78,7 @@ void Test5_1_6(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 0: Verify topology is formed correctly");
|
||||
|
||||
@@ -92,7 +92,7 @@ void Test5_1_8(void)
|
||||
router3.SetName("ROUTER_3");
|
||||
dut.SetName("ROUTER_4");
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ void Test5_1_9(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
/**
|
||||
* Step 1: Leader, Router_1, REED_2, REED_1
|
||||
|
||||
@@ -95,7 +95,7 @@ void Test5_2_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelInfo);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelInfo));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Router_1 (DUT)");
|
||||
|
||||
@@ -86,7 +86,7 @@ void Test5_2_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
leader.Get<Mle::Mle>().SetRouterUpgradeThreshold(kMaxRouters);
|
||||
leader.Get<Mle::Mle>().SetRouterDowngradeThreshold(kMaxRouters);
|
||||
|
||||
@@ -107,7 +107,7 @@ void Test5_2_4(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/** Use AllowList feature to restrict the topology. */
|
||||
for (uint16_t i = 0; i < kNumRouters; i++)
|
||||
|
||||
@@ -110,7 +110,7 @@ void Test5_2_5(void)
|
||||
reed1.SetName("REED_1");
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Use AllowList feature to restrict the topology.
|
||||
|
||||
@@ -108,7 +108,7 @@ void Test_5_2_6(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
leader.Get<Mle::Mle>().SetRouterUpgradeThreshold(kRouterUpgradeThreshold);
|
||||
leader.Get<Mle::Mle>().SetRouterDowngradeThreshold(kRouterDowngradeThreshold);
|
||||
|
||||
@@ -109,7 +109,7 @@ void Test5_2_7(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -83,7 +83,7 @@ void Test5_3_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Router_1 and Leader");
|
||||
|
||||
@@ -119,7 +119,7 @@ void Test5_3_10(void)
|
||||
med1.SetName("MED_1");
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("Step 1: Border Router");
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ void Test5_3_11(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -86,7 +86,7 @@ void Test5_3_2(void)
|
||||
dut.SetName("DUT");
|
||||
sed1.SetName("SED_1");
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -109,7 +109,7 @@ void Test5_3_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -100,7 +100,7 @@ void Test5_3_4(void)
|
||||
|
||||
Node *meds[] = {&med1, &med2, &med3, &med4};
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -106,7 +106,7 @@ void Test5_3_5(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -80,7 +80,7 @@ void Test5_3_6(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -104,7 +104,7 @@ void Test5_3_7(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -123,7 +123,7 @@ void Test5_3_8(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/** Use AllowList feature to restrict the topology. */
|
||||
leader.AllowList(br);
|
||||
|
||||
@@ -125,7 +125,7 @@ void Test5_3_9(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: Leader
|
||||
|
||||
@@ -89,7 +89,7 @@ void Test5_5_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -105,7 +105,7 @@ void Test5_5_2(void)
|
||||
router1.SetName("ROUTER_1");
|
||||
med1.SetName("MED_1");
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -99,7 +99,7 @@ void Test5_5_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 0: All");
|
||||
|
||||
@@ -104,7 +104,7 @@ void Test5_5_4_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -112,7 +112,7 @@ void Test5_5_4_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -99,7 +99,7 @@ void Test5_5_5(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -95,7 +95,7 @@ void Test5_5_7(void)
|
||||
router2.SetName("ROUTER_2");
|
||||
router3.SetName("ROUTER_3");
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -101,7 +101,7 @@ void Test5_6_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
/**
|
||||
|
||||
@@ -104,7 +104,7 @@ void Test5_6_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
/**
|
||||
|
||||
@@ -96,7 +96,7 @@ void Test5_6_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("Step 1: All");
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ void Test5_6_4(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -88,7 +88,7 @@ void Test5_6_5(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -112,7 +112,7 @@ void Test5_6_6(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -126,7 +126,7 @@ void Test5_6_7(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -130,7 +130,7 @@ void Test5_6_9(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
med1.Get<Mle::Mle>().SetTimeout(kLargeTimeout);
|
||||
sed1.Get<Mle::Mle>().SetTimeout(kLargeTimeout);
|
||||
|
||||
@@ -90,7 +90,7 @@ void Test5_7_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -123,7 +123,7 @@ void Test5_7_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -140,7 +140,7 @@ void Test5_7_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -82,7 +82,7 @@ void Test5_8_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Leader forms the network");
|
||||
|
||||
@@ -89,7 +89,7 @@ void Test5_8_3(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Leader forms network with KeySequenceCounter = 127");
|
||||
|
||||
@@ -96,7 +96,7 @@ void Test5_8_4(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -98,7 +98,7 @@ void RunTest6_1_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
if (aTopology == kTopologyA)
|
||||
{
|
||||
|
||||
@@ -96,7 +96,7 @@ void RunTest6_1_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -112,7 +112,7 @@ void RunTest6_1_3(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
if (aTopology == kTopologyA)
|
||||
|
||||
@@ -121,7 +121,7 @@ void Test6_1_4(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -112,7 +112,7 @@ void Test6_1_5(void)
|
||||
|
||||
nexus.AdvanceTime(kStartTime);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: Setup the topology without the DUT. Ensure all routers and leader are sending MLE advertisements.");
|
||||
|
||||
@@ -122,7 +122,7 @@ void RunTest6_1_6(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -90,7 +90,7 @@ void RunTest6_1_7(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -89,7 +89,7 @@ void RunTest6_2_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -124,7 +124,7 @@ void RunTest_6_2_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -127,7 +127,7 @@ void RunTest6_3_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
if (aTopology == kTopologyA)
|
||||
|
||||
@@ -109,7 +109,7 @@ void RunTest6_3_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -113,7 +113,7 @@ void RunTest6_4_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
if (aTopology == kTopologyA)
|
||||
{
|
||||
|
||||
@@ -115,7 +115,7 @@ void RunTest6_4_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -114,7 +114,7 @@ void RunTest6_5_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -112,7 +112,7 @@ void RunTest_6_5_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
if (aTopology == kTopologyA)
|
||||
|
||||
@@ -130,7 +130,7 @@ void RunTest6_5_3(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -110,7 +110,7 @@ void RunTest6_6_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
if (aTopology == kTopologyA)
|
||||
{
|
||||
|
||||
@@ -110,7 +110,7 @@ void RunTest6_6_2(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
if (aTopology == kTopologyA)
|
||||
{
|
||||
|
||||
@@ -94,7 +94,7 @@ void Test7_1_1(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: Leader (DUT)
|
||||
|
||||
@@ -99,7 +99,7 @@ void Test7_1_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: Leader
|
||||
|
||||
@@ -99,7 +99,7 @@ void Test7_1_3(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -101,7 +101,7 @@ void Test7_1_4(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -82,7 +82,7 @@ void Test7_1_5(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
/**
|
||||
* Step 1: All
|
||||
|
||||
@@ -109,7 +109,7 @@ void Test7_1_6(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -111,7 +111,7 @@ void Test7_1_7(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -107,7 +107,7 @@ void Test7_1_8(const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -154,7 +154,7 @@ void Test1_1_8_1_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
// Remove any existing key log file.
|
||||
remove(kKeyLogFilename);
|
||||
|
||||
@@ -159,7 +159,7 @@ void Test8_1_2(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
// Remove any existing key log file.
|
||||
remove(kKeyLogFilename);
|
||||
|
||||
@@ -154,7 +154,7 @@ void Test1_1_8_1_6(const char *aJsonFileName)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
// Remove any existing key log file.
|
||||
remove(kKeyLogFilename);
|
||||
|
||||
@@ -157,7 +157,7 @@ void Test1_1_8_2_1(const char *aJsonFileName)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 0: All");
|
||||
|
||||
@@ -157,7 +157,7 @@ void Test8_2_2(const char *aJsonFileName)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
#if OPENTHREAD_CONFIG_MBEDTLS_PROVIDES_SSL_KEY_EXPORT
|
||||
remove("test_1_1_8_2_2.keys");
|
||||
|
||||
@@ -87,7 +87,7 @@ void Test_1_1_8_3_1(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -99,7 +99,7 @@ void RunTest9_2_1(Topology aTopology, const char *aJsonFile)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -170,7 +170,7 @@ void Test9_2_10(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
@@ -167,7 +167,7 @@ void Test9_2_11(void)
|
||||
|
||||
nexus.AdvanceTime(0);
|
||||
|
||||
Instance::SetLogLevel(kLogLevelNote);
|
||||
SuccessOrQuit(Instance::SetGlobalLogLevel(kLogLevelNote));
|
||||
|
||||
Log("---------------------------------------------------------------------------------------");
|
||||
Log("Step 1: All");
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user