diff --git a/.github/workflows/simulation-1.2.yml b/.github/workflows/simulation-1.2.yml index b35780095..59addc0f9 100644 --- a/.github/workflows/simulation-1.2.yml +++ b/.github/workflows/simulation-1.2.yml @@ -227,7 +227,7 @@ jobs: COVERAGE: 1 MULTIPLY: 3 PYTHONUNBUFFERED: 1 - OTBR_COMMIT: "d1671cfa4777d3a1bb565b88856f1ef446fe760f" # Sep 22, 2020 + OTBR_COMMIT: "e05ad0ea47461bc7aa48858cf7e1d7a9c9044fed" # Sep 29, 2020 steps: - uses: actions/checkout@v2 - name: Build OTBR Docker diff --git a/.github/workflows/simulation.yml b/.github/workflows/simulation.yml index 20989f357..f6560d265 100644 --- a/.github/workflows/simulation.yml +++ b/.github/workflows/simulation.yml @@ -88,7 +88,7 @@ jobs: ./bootstrap - name: Run OTNS Tests env: - OTNS_COMMIT: "8e9b4ba5825dd37e6e84f7801dd72101fde3d191" # Sep 17, 2020 + OTNS_COMMIT: "632503d7ccbadcbdc49c6245eafc2425c80bbf04" # Sep 29, 2020 run: | export OT_DIR=$PWD mkdir -p /tmp/otns diff --git a/examples/platforms/efr32mg12/sleepy-demo/sleepy-demo-mtd/main.c b/examples/platforms/efr32mg12/sleepy-demo/sleepy-demo-mtd/main.c index b1d34a3d0..6f5112e2b 100644 --- a/examples/platforms/efr32mg12/sleepy-demo/sleepy-demo-mtd/main.c +++ b/examples/platforms/efr32mg12/sleepy-demo/sleepy-demo-mtd/main.c @@ -103,10 +103,9 @@ int main(int argc, char *argv[]) setNetworkConfiguration(instance); otSetStateChangedCallback(instance, handleNetifStateChanged, instance); - config.mRxOnWhenIdle = true; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = true; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); initUdp(); @@ -207,10 +206,9 @@ void handleNetifStateChanged(uint32_t aFlags, void *aContext) break; case OT_DEVICE_ROLE_CHILD: - config.mRxOnWhenIdle = 0; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = 0; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); sAllowDeepSleep = true; break; @@ -308,12 +306,11 @@ void applicationTick(void) if (sRxOnIdleButtonPressed == true) { - sRxOnIdleButtonPressed = false; - sAllowDeepSleep = !sAllowDeepSleep; - config.mRxOnWhenIdle = !sAllowDeepSleep; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + sRxOnIdleButtonPressed = false; + sAllowDeepSleep = !sAllowDeepSleep; + config.mRxOnWhenIdle = !sAllowDeepSleep; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); } diff --git a/examples/platforms/efr32mg13/sleepy-demo/sleepy-demo-mtd/main.c b/examples/platforms/efr32mg13/sleepy-demo/sleepy-demo-mtd/main.c index b1d34a3d0..6f5112e2b 100644 --- a/examples/platforms/efr32mg13/sleepy-demo/sleepy-demo-mtd/main.c +++ b/examples/platforms/efr32mg13/sleepy-demo/sleepy-demo-mtd/main.c @@ -103,10 +103,9 @@ int main(int argc, char *argv[]) setNetworkConfiguration(instance); otSetStateChangedCallback(instance, handleNetifStateChanged, instance); - config.mRxOnWhenIdle = true; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = true; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); initUdp(); @@ -207,10 +206,9 @@ void handleNetifStateChanged(uint32_t aFlags, void *aContext) break; case OT_DEVICE_ROLE_CHILD: - config.mRxOnWhenIdle = 0; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = 0; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); sAllowDeepSleep = true; break; @@ -308,12 +306,11 @@ void applicationTick(void) if (sRxOnIdleButtonPressed == true) { - sRxOnIdleButtonPressed = false; - sAllowDeepSleep = !sAllowDeepSleep; - config.mRxOnWhenIdle = !sAllowDeepSleep; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + sRxOnIdleButtonPressed = false; + sAllowDeepSleep = !sAllowDeepSleep; + config.mRxOnWhenIdle = !sAllowDeepSleep; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); } diff --git a/examples/platforms/efr32mg21/sleepy-demo/sleepy-demo-mtd/main.c b/examples/platforms/efr32mg21/sleepy-demo/sleepy-demo-mtd/main.c index ebb3169eb..bf510797a 100644 --- a/examples/platforms/efr32mg21/sleepy-demo/sleepy-demo-mtd/main.c +++ b/examples/platforms/efr32mg21/sleepy-demo/sleepy-demo-mtd/main.c @@ -105,10 +105,9 @@ int main(int argc, char *argv[]) setNetworkConfiguration(instance); otSetStateChangedCallback(instance, handleNetifStateChanged, instance); - config.mRxOnWhenIdle = true; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = true; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); initUdp(); @@ -225,10 +224,9 @@ void handleNetifStateChanged(uint32_t aFlags, void *aContext) break; case OT_DEVICE_ROLE_CHILD: - config.mRxOnWhenIdle = 0; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + config.mRxOnWhenIdle = 0; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); sAllowDeepSleep = true; break; @@ -326,12 +324,11 @@ void applicationTick(void) if (sRxOnIdleButtonPressed == true) { - sRxOnIdleButtonPressed = false; - sAllowDeepSleep = !sAllowDeepSleep; - config.mRxOnWhenIdle = !sAllowDeepSleep; - config.mSecureDataRequests = true; - config.mDeviceType = 0; - config.mNetworkData = 0; + sRxOnIdleButtonPressed = false; + sAllowDeepSleep = !sAllowDeepSleep; + config.mRxOnWhenIdle = !sAllowDeepSleep; + config.mDeviceType = 0; + config.mNetworkData = 0; otThreadSetLinkMode(instance, config); } diff --git a/include/openthread/instance.h b/include/openthread/instance.h index 6bc4c9df4..77285558c 100644 --- a/include/openthread/instance.h +++ b/include/openthread/instance.h @@ -53,7 +53,7 @@ extern "C" { * @note This number versions both OpenThread platform and user APIs. * */ -#define OPENTHREAD_API_VERSION (29) +#define OPENTHREAD_API_VERSION (30) /** * @addtogroup api-instance diff --git a/include/openthread/thread.h b/include/openthread/thread.h index 7442b842e..9d0f9fc6b 100644 --- a/include/openthread/thread.h +++ b/include/openthread/thread.h @@ -78,10 +78,9 @@ typedef enum */ typedef struct otLinkModeConfig { - bool mRxOnWhenIdle : 1; ///< 1, if the sender has its receiver on when not transmitting. 0, otherwise. - bool mSecureDataRequests : 1; ///< 1, if the sender uses IEEE 802.15.4 to secure all data requests. 0, otherwise. - bool mDeviceType : 1; ///< 1, if the sender is an FTD. 0, otherwise. - bool mNetworkData : 1; ///< 1, if the sender requires the full Network Data. 0, otherwise. + bool mRxOnWhenIdle : 1; ///< 1, if the sender has its receiver on when not transmitting. 0, otherwise. + bool mDeviceType : 1; ///< 1, if the sender is an FTD. 0, otherwise. + bool mNetworkData : 1; ///< 1, if the sender requires the full Network Data. 0, otherwise. } otLinkModeConfig; /** @@ -90,21 +89,20 @@ typedef struct otLinkModeConfig */ typedef struct { - otExtAddress mExtAddress; ///< IEEE 802.15.4 Extended Address - uint32_t mAge; ///< Time last heard - uint16_t mRloc16; ///< RLOC16 - uint32_t mLinkFrameCounter; ///< Link Frame Counter - uint32_t mMleFrameCounter; ///< MLE Frame Counter - uint8_t mLinkQualityIn; ///< Link Quality In - int8_t mAverageRssi; ///< Average RSSI - int8_t mLastRssi; ///< Last observed RSSI - uint16_t mFrameErrorRate; ///< Frame error rate (0xffff->100%). Requires error tracking feature. - uint16_t mMessageErrorRate; ///< (IPv6) msg error rate (0xffff->100%). Requires error tracking feature. - bool mRxOnWhenIdle : 1; ///< rx-on-when-idle - bool mSecureDataRequest : 1; ///< Secure Data Requests - bool mFullThreadDevice : 1; ///< Full Thread Device - bool mFullNetworkData : 1; ///< Full Network Data - bool mIsChild : 1; ///< Is the neighbor a child + otExtAddress mExtAddress; ///< IEEE 802.15.4 Extended Address + uint32_t mAge; ///< Time last heard + uint16_t mRloc16; ///< RLOC16 + uint32_t mLinkFrameCounter; ///< Link Frame Counter + uint32_t mMleFrameCounter; ///< MLE Frame Counter + uint8_t mLinkQualityIn; ///< Link Quality In + int8_t mAverageRssi; ///< Average RSSI + int8_t mLastRssi; ///< Last observed RSSI + uint16_t mFrameErrorRate; ///< Frame error rate (0xffff->100%). Requires error tracking feature. + uint16_t mMessageErrorRate; ///< (IPv6) msg error rate (0xffff->100%). Requires error tracking feature. + bool mRxOnWhenIdle : 1; ///< rx-on-when-idle + bool mFullThreadDevice : 1; ///< Full Thread Device + bool mFullNetworkData : 1; ///< Full Network Data + bool mIsChild : 1; ///< Is the neighbor a child } otNeighborInfo; #define OT_NEIGHBOR_INFO_ITERATOR_INIT 0 ///< Initializer for otNeighborInfoIterator. diff --git a/include/openthread/thread_ftd.h b/include/openthread/thread_ftd.h index d9db8624e..7bad904ef 100644 --- a/include/openthread/thread_ftd.h +++ b/include/openthread/thread_ftd.h @@ -56,22 +56,21 @@ extern "C" { */ typedef struct { - otExtAddress mExtAddress; ///< IEEE 802.15.4 Extended Address - uint32_t mTimeout; ///< Timeout - uint32_t mAge; ///< Time last heard - uint16_t mRloc16; ///< RLOC16 - uint16_t mChildId; ///< Child ID - uint8_t mNetworkDataVersion; ///< Network Data Version - uint8_t mLinkQualityIn; ///< Link Quality In - int8_t mAverageRssi; ///< Average RSSI - int8_t mLastRssi; ///< Last observed RSSI - uint16_t mFrameErrorRate; ///< Frame error rate (0xffff->100%). Requires error tracking feature. - uint16_t mMessageErrorRate; ///< (IPv6) msg error rate (0xffff->100%). Requires error tracking feature. - bool mRxOnWhenIdle : 1; ///< rx-on-when-idle - bool mSecureDataRequest : 1; ///< Secure Data Requests - bool mFullThreadDevice : 1; ///< Full Thread Device - bool mFullNetworkData : 1; ///< Full Network Data - bool mIsStateRestoring : 1; ///< Is in restoring state + otExtAddress mExtAddress; ///< IEEE 802.15.4 Extended Address + uint32_t mTimeout; ///< Timeout + uint32_t mAge; ///< Time last heard + uint16_t mRloc16; ///< RLOC16 + uint16_t mChildId; ///< Child ID + uint8_t mNetworkDataVersion; ///< Network Data Version + uint8_t mLinkQualityIn; ///< Link Quality In + int8_t mAverageRssi; ///< Average RSSI + int8_t mLastRssi; ///< Last observed RSSI + uint16_t mFrameErrorRate; ///< Frame error rate (0xffff->100%). Requires error tracking feature. + uint16_t mMessageErrorRate; ///< (IPv6) msg error rate (0xffff->100%). Requires error tracking feature. + bool mRxOnWhenIdle : 1; ///< rx-on-when-idle + bool mFullThreadDevice : 1; ///< Full Thread Device + bool mFullNetworkData : 1; ///< Full Network Data + bool mIsStateRestoring : 1; ///< Is in restoring state } otChildInfo; #define OT_CHILD_IP6_ADDRESS_ITERATOR_INIT 0 ///< Initializer for otChildIP6AddressIterator diff --git a/src/cli/README.md b/src/cli/README.md index 41e4b5219..33b525ffe 100644 --- a/src/cli/README.md +++ b/src/cli/README.md @@ -1185,28 +1185,33 @@ Done Get the Thread Device Mode value. +- -: no flags set (rx-off-when-idle, minimal Thread device, stable network data) - r: rx-on-when-idle -- s: Secure IEEE 802.15.4 data requests - d: Full Thread Device - n: Full Network Data ```bash > mode -rsdn +rdn Done ``` -### mode [rsdn] +### mode [rdn] Set the Thread Device Mode value. +- -: no flags set (rx-off-when-idle, minimal Thread device, stable network data) - r: rx-on-when-idle -- s: Secure IEEE 802.15.4 data requests - d: Full Thread Device - n: Full Network Data ```bash -> mode rsdn +> mode rdn +Done +``` + +```bash +> mode - Done ``` diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 263b7deae..81205ad1b 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -852,8 +852,8 @@ otError Interpreter::ProcessChild(uint8_t aArgsLength, char *aArgs[]) if (isTable) { - OutputLine("| ID | RLOC16 | Timeout | Age | LQ In | C_VN |R|S|D|N| Extended MAC |"); - OutputLine("+-----+--------+------------+------------+-------+------+-+-+-+-+------------------+"); + OutputLine("| ID | RLOC16 | Timeout | Age | LQ In | C_VN |R|D|N| Extended MAC |"); + OutputLine("+-----+--------+------------+------------+-------+------+-+-+-+------------------+"); } maxChildren = otThreadGetMaxAllowedChildren(mInstance); @@ -874,7 +874,6 @@ otError Interpreter::ProcessChild(uint8_t aArgsLength, char *aArgs[]) OutputFormat("| %5d ", childInfo.mLinkQualityIn); OutputFormat("| %4d ", childInfo.mNetworkDataVersion); OutputFormat("|%1d", childInfo.mRxOnWhenIdle); - OutputFormat("|%1d", childInfo.mSecureDataRequest); OutputFormat("|%1d", childInfo.mFullThreadDevice); OutputFormat("|%1d", childInfo.mFullNetworkData); OutputFormat("| "); @@ -901,24 +900,26 @@ otError Interpreter::ProcessChild(uint8_t aArgsLength, char *aArgs[]) OutputLine(""); OutputFormat("Mode: "); - if (childInfo.mRxOnWhenIdle) + if (!(childInfo.mRxOnWhenIdle || childInfo.mFullThreadDevice || childInfo.mFullNetworkData)) { - OutputFormat("r"); + OutputFormat("-"); } - - if (childInfo.mSecureDataRequest) + else { - OutputFormat("s"); - } + if (childInfo.mRxOnWhenIdle) + { + OutputFormat("r"); + } - if (childInfo.mFullThreadDevice) - { - OutputFormat("d"); - } + if (childInfo.mFullThreadDevice) + { + OutputFormat("d"); + } - if (childInfo.mFullNetworkData) - { - OutputFormat("n"); + if (childInfo.mFullNetworkData) + { + OutputFormat("n"); + } } OutputLine(""); @@ -2141,29 +2142,34 @@ otError Interpreter::ProcessMode(uint8_t aArgsLength, char *aArgs[]) { linkMode = otThreadGetLinkMode(mInstance); - if (linkMode.mRxOnWhenIdle) + if (!(linkMode.mRxOnWhenIdle || linkMode.mDeviceType || linkMode.mNetworkData)) { - OutputFormat("r"); + OutputFormat("-"); } - - if (linkMode.mSecureDataRequests) + else { - OutputFormat("s"); - } + if (linkMode.mRxOnWhenIdle) + { + OutputFormat("r"); + } - if (linkMode.mDeviceType) - { - OutputFormat("d"); - } + if (linkMode.mDeviceType) + { + OutputFormat("d"); + } - if (linkMode.mNetworkData) - { - OutputFormat("n"); + if (linkMode.mNetworkData) + { + OutputFormat("n"); + } } OutputLine(""); + + ExitNow(); } - else + + if (strcmp(aArgs[0], "-") != 0) { for (char *arg = aArgs[0]; *arg != '\0'; arg++) { @@ -2173,10 +2179,6 @@ otError Interpreter::ProcessMode(uint8_t aArgsLength, char *aArgs[]) linkMode.mRxOnWhenIdle = 1; break; - case 's': - linkMode.mSecureDataRequests = 1; - break; - case 'd': linkMode.mDeviceType = 1; break; @@ -2189,10 +2191,10 @@ otError Interpreter::ProcessMode(uint8_t aArgsLength, char *aArgs[]) ExitNow(error = OT_ERROR_INVALID_ARGS); } } - - SuccessOrExit(error = otThreadSetLinkMode(mInstance, linkMode)); } + error = otThreadSetLinkMode(mInstance, linkMode); + exit: return error; } @@ -2213,8 +2215,8 @@ otError Interpreter::ProcessNeighbor(uint8_t aArgsLength, char *aArgs[]) { if (isTable) { - OutputLine("| Role | RLOC16 | Age | Avg RSSI | Last RSSI |R|S|D|N| Extended MAC |"); - OutputLine("+------+--------+-----+----------+-----------+-+-+-+-+------------------+"); + OutputLine("| Role | RLOC16 | Age | Avg RSSI | Last RSSI |R|D|N| Extended MAC |"); + OutputLine("+------+--------+-----+----------+-----------+-+-+-+------------------+"); } while (otThreadGetNextNeighborInfo(mInstance, &iterator, &neighborInfo) == OT_ERROR_NONE) @@ -2227,7 +2229,6 @@ otError Interpreter::ProcessNeighbor(uint8_t aArgsLength, char *aArgs[]) OutputFormat("| %8d ", neighborInfo.mAverageRssi); OutputFormat("| %9d ", neighborInfo.mLastRssi); OutputFormat("|%1d", neighborInfo.mRxOnWhenIdle); - OutputFormat("|%1d", neighborInfo.mSecureDataRequest); OutputFormat("|%1d", neighborInfo.mFullThreadDevice); OutputFormat("|%1d", neighborInfo.mFullNetworkData); OutputFormat("| "); @@ -4446,9 +4447,6 @@ void Interpreter::OutputMode(const otLinkModeConfig &aMode, uint16_t aColumn) OutputSpaces(aColumn); OutputLine("RxOnWhenIdle: %d", aMode.mRxOnWhenIdle); - OutputSpaces(aColumn); - OutputLine("SecureDataRequests: %d", aMode.mSecureDataRequests); - OutputSpaces(aColumn); OutputLine("DeviceType: %d", aMode.mDeviceType); diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 261a623c2..ede7a1e70 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -65,7 +65,7 @@ Mle::Mle(Instance &aInstance) , mRetrieveNewNetworkData(false) , mRole(kRoleDisabled) , mNeighborTable(aInstance) - , mDeviceMode(DeviceMode::kModeRxOnWhenIdle | DeviceMode::kModeSecureDataRequest) + , mDeviceMode(DeviceMode::kModeRxOnWhenIdle) , mAttachState(kAttachStateIdle) , mReattachState(kReattachStop) , mAttachCounter(0) @@ -377,7 +377,7 @@ otError Mle::Restore(void) mParent.SetExtAddress(parentInfo.GetExtAddress()); mParent.SetVersion(static_cast(parentInfo.GetVersion())); mParent.SetDeviceMode(DeviceMode(DeviceMode::kModeFullThreadDevice | DeviceMode::kModeRxOnWhenIdle | - DeviceMode::kModeFullNetworkData | DeviceMode::kModeSecureDataRequest)); + DeviceMode::kModeFullNetworkData)); mParent.SetRloc16(Rloc16FromRouterId(RouterIdFromRloc16(networkInfo.GetRloc16()))); mParent.SetState(Neighbor::kStateRestored); @@ -3264,7 +3264,7 @@ void Mle::HandleParentResponse(const Message &aMessage, const Ip6::MessageInfo & mParentCandidate.SetMleFrameCounter(mleFrameCounter); mParentCandidate.SetVersion(static_cast(version)); mParentCandidate.SetDeviceMode(DeviceMode(DeviceMode::kModeFullThreadDevice | DeviceMode::kModeRxOnWhenIdle | - DeviceMode::kModeFullNetworkData | DeviceMode::kModeSecureDataRequest)); + DeviceMode::kModeFullNetworkData)); mParentCandidate.GetLinkInfo().Clear(); mParentCandidate.GetLinkInfo().AddRss(linkInfo->GetRss()); mParentCandidate.ResetLinkFailures(); diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp index 239a6520d..589e37942 100644 --- a/src/core/thread/mle.hpp +++ b/src/core/thread/mle.hpp @@ -310,14 +310,6 @@ public: */ bool IsFullThreadDevice(void) const { return mDeviceMode.IsFullThreadDevice(); } - /** - * This method indicates whether or not the device uses secure IEEE 802.15.4 Data Request messages. - * - * @returns TRUE if using secure IEEE 802.15.4 Data Request messages, FALSE otherwise. - * - */ - bool IsSecureDataRequest(void) const { return mDeviceMode.IsSecureDataRequest(); } - /** * This method indicates whether or not the device requests Full Network Data. * diff --git a/src/core/thread/mle_types.cpp b/src/core/thread/mle_types.cpp index 29a076796..9402b5551 100644 --- a/src/core/thread/mle_types.cpp +++ b/src/core/thread/mle_types.cpp @@ -40,26 +40,23 @@ namespace Mle { void DeviceMode::Get(ModeConfig &aModeConfig) const { - aModeConfig.mRxOnWhenIdle = IsRxOnWhenIdle(); - aModeConfig.mSecureDataRequests = IsSecureDataRequest(); - aModeConfig.mDeviceType = IsFullThreadDevice(); - aModeConfig.mNetworkData = IsFullNetworkData(); + aModeConfig.mRxOnWhenIdle = IsRxOnWhenIdle(); + aModeConfig.mDeviceType = IsFullThreadDevice(); + aModeConfig.mNetworkData = IsFullNetworkData(); } void DeviceMode::Set(const ModeConfig &aModeConfig) { - mMode = 0; + mMode = kModeReserved; mMode |= aModeConfig.mRxOnWhenIdle ? kModeRxOnWhenIdle : 0; - mMode |= aModeConfig.mSecureDataRequests ? kModeSecureDataRequest : 0; mMode |= aModeConfig.mDeviceType ? kModeFullThreadDevice : 0; mMode |= aModeConfig.mNetworkData ? kModeFullNetworkData : 0; } DeviceMode::InfoString DeviceMode::ToString(void) const { - return InfoString("rx-on:%s sec-poll:%s ftd:%s full-net:%s", IsRxOnWhenIdle() ? "yes" : "no", - IsSecureDataRequest() ? "yes" : "no", IsFullThreadDevice() ? "yes" : "no", - IsFullNetworkData() ? "yes" : "no"); + return InfoString("rx-on:%s ftd:%s full-net:%s", IsRxOnWhenIdle() ? "yes" : "no", + IsFullThreadDevice() ? "yes" : "no", IsFullNetworkData() ? "yes" : "no"); } void MeshLocalPrefix::SetFromExtendedPanId(const Mac::ExtendedPanId &aExtendedPanId) diff --git a/src/core/thread/mle_types.hpp b/src/core/thread/mle_types.hpp index 81bb0a7be..82f64817a 100644 --- a/src/core/thread/mle_types.hpp +++ b/src/core/thread/mle_types.hpp @@ -302,10 +302,10 @@ class DeviceMode : public Equatable public: enum { - kModeRxOnWhenIdle = 1 << 3, ///< If the device has its receiver on when not transmitting. - kModeSecureDataRequest = 1 << 2, ///< If the device uses link layer security for all data requests. - kModeFullThreadDevice = 1 << 1, ///< If the device is an FTD. - kModeFullNetworkData = 1 << 0, ///< If the device requires the full Network Data. + kModeRxOnWhenIdle = 1 << 3, ///< If the device has its receiver on when not transmitting. + kModeReserved = 1 << 2, ///< Set to 1 on transmission, ignore on reception. + kModeFullThreadDevice = 1 << 1, ///< If the device is an FTD. + kModeFullNetworkData = 1 << 0, ///< If the device requires the full Network Data. kInfoStringSize = 45, ///< String buffer size used for `ToString()`. }; @@ -361,7 +361,7 @@ public: * @param[in] aMode A mode TLV bitmask. * */ - void Set(uint8_t aMode) { mMode = aMode; } + void Set(uint8_t aMode) { mMode = aMode | kModeReserved; } /** * This method gets the device mode as a mode configuration structure. @@ -388,15 +388,6 @@ public: */ bool IsRxOnWhenIdle(void) const { return (mMode & kModeRxOnWhenIdle) != 0; } - /** - * This method indicates whether or not the device uses secure IEEE 802.15.4 Data Request messages. - * - * @retval TRUE If the device uses secure IEEE 802.15.4 Data Request (data poll) messages. - * @retval FALSE If the device uses any IEEE 802.15.4 Data Request (data poll) messages. - * - */ - bool IsSecureDataRequest(void) const { return (mMode & kModeSecureDataRequest) != 0; } - /** * This method indicates whether or not the device is a Full Thread Device. * diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index 97cd61f2b..b1490117c 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -661,10 +661,9 @@ exit: static inline void ParseMode(const Mle::DeviceMode &aMode, otLinkModeConfig &aLinkModeConfig) { - aLinkModeConfig.mRxOnWhenIdle = aMode.IsRxOnWhenIdle(); - aLinkModeConfig.mSecureDataRequests = aMode.IsSecureDataRequest(); - aLinkModeConfig.mDeviceType = aMode.IsFullThreadDevice(); - aLinkModeConfig.mNetworkData = aMode.IsFullNetworkData(); + aLinkModeConfig.mRxOnWhenIdle = aMode.IsRxOnWhenIdle(); + aLinkModeConfig.mDeviceType = aMode.IsFullThreadDevice(); + aLinkModeConfig.mNetworkData = aMode.IsFullNetworkData(); } static inline void ParseConnectivity(const ConnectivityTlv & aConnectivityTlv, diff --git a/src/core/thread/topology.cpp b/src/core/thread/topology.cpp index 25652145e..1e126843c 100644 --- a/src/core/thread/topology.cpp +++ b/src/core/thread/topology.cpp @@ -66,20 +66,19 @@ exit: void Neighbor::Info::SetFrom(const Neighbor &aNeighbor) { Clear(); - mExtAddress = aNeighbor.GetExtAddress(); - mAge = Time::MsecToSec(TimerMilli::GetNow() - aNeighbor.GetLastHeard()); - mRloc16 = aNeighbor.GetRloc16(); - mLinkFrameCounter = aNeighbor.GetLinkFrameCounter(); - mMleFrameCounter = aNeighbor.GetMleFrameCounter(); - mLinkQualityIn = aNeighbor.GetLinkInfo().GetLinkQuality(); - mAverageRssi = aNeighbor.GetLinkInfo().GetAverageRss(); - mLastRssi = aNeighbor.GetLinkInfo().GetLastRss(); - mFrameErrorRate = aNeighbor.GetLinkInfo().GetFrameErrorRate(); - mMessageErrorRate = aNeighbor.GetLinkInfo().GetMessageErrorRate(); - mRxOnWhenIdle = aNeighbor.IsRxOnWhenIdle(); - mSecureDataRequest = aNeighbor.IsSecureDataRequest(); - mFullThreadDevice = aNeighbor.IsFullThreadDevice(); - mFullNetworkData = aNeighbor.IsFullNetworkData(); + mExtAddress = aNeighbor.GetExtAddress(); + mAge = Time::MsecToSec(TimerMilli::GetNow() - aNeighbor.GetLastHeard()); + mRloc16 = aNeighbor.GetRloc16(); + mLinkFrameCounter = aNeighbor.GetLinkFrameCounter(); + mMleFrameCounter = aNeighbor.GetMleFrameCounter(); + mLinkQualityIn = aNeighbor.GetLinkInfo().GetLinkQuality(); + mAverageRssi = aNeighbor.GetLinkInfo().GetAverageRss(); + mLastRssi = aNeighbor.GetLinkInfo().GetLastRss(); + mFrameErrorRate = aNeighbor.GetLinkInfo().GetFrameErrorRate(); + mMessageErrorRate = aNeighbor.GetLinkInfo().GetMessageErrorRate(); + mRxOnWhenIdle = aNeighbor.IsRxOnWhenIdle(); + mFullThreadDevice = aNeighbor.IsFullThreadDevice(); + mFullNetworkData = aNeighbor.IsFullNetworkData(); } void Neighbor::Init(Instance &aInstance) @@ -175,7 +174,6 @@ void Child::Info::SetFrom(const Child &aChild) mFrameErrorRate = aChild.GetLinkInfo().GetFrameErrorRate(); mMessageErrorRate = aChild.GetLinkInfo().GetMessageErrorRate(); mRxOnWhenIdle = aChild.IsRxOnWhenIdle(); - mSecureDataRequest = aChild.IsSecureDataRequest(); mFullThreadDevice = aChild.IsFullThreadDevice(); mFullNetworkData = aChild.IsFullNetworkData(); mIsStateRestoring = aChild.IsStateRestoring(); diff --git a/src/core/thread/topology.hpp b/src/core/thread/topology.hpp index c1d2bba5d..06f30eafa 100644 --- a/src/core/thread/topology.hpp +++ b/src/core/thread/topology.hpp @@ -337,14 +337,6 @@ public: */ bool IsFullThreadDevice(void) const { return GetDeviceMode().IsFullThreadDevice(); } - /** - * This method indicates whether or not the device uses secure IEEE 802.15.4 Data Request messages. - * - * @returns TRUE if using secure IEEE 802.15.4 Data Request messages, FALSE otherwise. - * - */ - bool IsSecureDataRequest(void) const { return GetDeviceMode().IsSecureDataRequest(); } - /** * This method indicates whether or not the device requests Full Network Data. * diff --git a/src/core/utils/otns.cpp b/src/core/utils/otns.cpp index f714e5a1d..0e0647f91 100644 --- a/src/core/utils/otns.cpp +++ b/src/core/utils/otns.cpp @@ -151,8 +151,8 @@ void Otns::EmitTransmit(const Mac::TxFrame &aFrame) void Otns::EmitDeviceMode(Mle::DeviceMode aMode) { - EmitStatus("mode=%s%s%s%s", aMode.IsRxOnWhenIdle() ? "r" : "", aMode.IsSecureDataRequest() ? "s" : "", - aMode.IsFullThreadDevice() ? "d" : "", aMode.IsFullNetworkData() ? "n" : ""); + EmitStatus("mode=%s%s%s", aMode.IsRxOnWhenIdle() ? "r" : "", aMode.IsFullThreadDevice() ? "d" : "", + aMode.IsFullNetworkData() ? "n" : ""); } } // namespace Utils diff --git a/src/ncp/ncp_base.hpp b/src/ncp/ncp_base.hpp index ceeb45b43..073a68f1f 100644 --- a/src/ncp/ncp_base.hpp +++ b/src/ncp/ncp_base.hpp @@ -514,10 +514,7 @@ protected: protected: static NcpBase * sNcpInstance; static spinel_status_t ThreadErrorToSpinelStatus(otError aError); - static uint8_t LinkFlagsToFlagByte(bool aRxOnWhenIdle, - bool aSecureDataRequests, - bool aDeviceType, - bool aNetworkData); + static uint8_t LinkFlagsToFlagByte(bool aRxOnWhenIdle, bool aDeviceType, bool aNetworkData); Instance * mInstance; Spinel::Buffer mTxFrameBuffer; Spinel::Encoder mEncoder; diff --git a/src/ncp/ncp_base_ftd.cpp b/src/ncp/ncp_base_ftd.cpp index 38df0d7ba..d5877c0e2 100644 --- a/src/ncp/ncp_base_ftd.cpp +++ b/src/ncp/ncp_base_ftd.cpp @@ -63,8 +63,8 @@ otError NcpBase::EncodeChildInfo(const otChildInfo &aChildInfo) otError error = OT_ERROR_NONE; uint8_t modeFlags; - modeFlags = LinkFlagsToFlagByte(aChildInfo.mRxOnWhenIdle, aChildInfo.mSecureDataRequest, - aChildInfo.mFullThreadDevice, aChildInfo.mFullNetworkData); + modeFlags = + LinkFlagsToFlagByte(aChildInfo.mRxOnWhenIdle, aChildInfo.mFullThreadDevice, aChildInfo.mFullNetworkData); SuccessOrExit(error = mEncoder.WriteEui64(aChildInfo.mExtAddress)); SuccessOrExit(error = mEncoder.WriteUint16(aChildInfo.mRloc16)); diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index b3987292f..51980358c 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -135,7 +135,7 @@ static uint8_t ExternalRoutePreferenceToFlagByte(int aPreference) return flags; } -uint8_t NcpBase::LinkFlagsToFlagByte(bool aRxOnWhenIdle, bool aSecureDataRequests, bool aDeviceType, bool aNetworkData) +uint8_t NcpBase::LinkFlagsToFlagByte(bool aRxOnWhenIdle, bool aDeviceType, bool aNetworkData) { uint8_t flags(0); @@ -144,11 +144,6 @@ uint8_t NcpBase::LinkFlagsToFlagByte(bool aRxOnWhenIdle, bool aSecureDataRequest flags |= SPINEL_THREAD_MODE_RX_ON_WHEN_IDLE; } - if (aSecureDataRequests) - { - flags |= SPINEL_THREAD_MODE_SECURE_DATA_REQUEST; - } - if (aDeviceType) { flags |= SPINEL_THREAD_MODE_FULL_THREAD_DEV; @@ -167,8 +162,8 @@ otError NcpBase::EncodeNeighborInfo(const otNeighborInfo &aNeighborInfo) otError error; uint8_t modeFlags; - modeFlags = LinkFlagsToFlagByte(aNeighborInfo.mRxOnWhenIdle, aNeighborInfo.mSecureDataRequest, - aNeighborInfo.mFullThreadDevice, aNeighborInfo.mFullNetworkData); + modeFlags = LinkFlagsToFlagByte(aNeighborInfo.mRxOnWhenIdle, aNeighborInfo.mFullThreadDevice, + aNeighborInfo.mFullNetworkData); SuccessOrExit(error = mEncoder.OpenStruct()); @@ -2848,8 +2843,7 @@ template <> otError NcpBase::HandlePropertyGet(void) uint8_t numericMode; otLinkModeConfig modeConfig = otThreadGetLinkMode(mInstance); - numericMode = LinkFlagsToFlagByte(modeConfig.mRxOnWhenIdle, modeConfig.mSecureDataRequests, modeConfig.mDeviceType, - modeConfig.mNetworkData); + numericMode = LinkFlagsToFlagByte(modeConfig.mRxOnWhenIdle, modeConfig.mDeviceType, modeConfig.mNetworkData); return mEncoder.WriteUint8(numericMode); } @@ -2864,8 +2858,6 @@ template <> otError NcpBase::HandlePropertySet(void) modeConfig.mRxOnWhenIdle = ((numericMode & SPINEL_THREAD_MODE_RX_ON_WHEN_IDLE) == SPINEL_THREAD_MODE_RX_ON_WHEN_IDLE); - modeConfig.mSecureDataRequests = - ((numericMode & SPINEL_THREAD_MODE_SECURE_DATA_REQUEST) == SPINEL_THREAD_MODE_SECURE_DATA_REQUEST); modeConfig.mDeviceType = ((numericMode & SPINEL_THREAD_MODE_FULL_THREAD_DEV) == SPINEL_THREAD_MODE_FULL_THREAD_DEV); modeConfig.mNetworkData = ((numericMode & SPINEL_THREAD_MODE_FULL_NETWORK_DATA) == SPINEL_THREAD_MODE_FULL_NETWORK_DATA); diff --git a/tests/scripts/expect/_multinode.exp b/tests/scripts/expect/_multinode.exp index a394dbd23..7a6f2cbf9 100644 --- a/tests/scripts/expect/_multinode.exp +++ b/tests/scripts/expect/_multinode.exp @@ -62,7 +62,7 @@ proc setup_nodes {} { expect "Done" set spawn_id $spawn_2 - send "mode rs\n" + send "mode r\n" expect "Done" send "ifconfig up\n" expect "Done" diff --git a/tests/scripts/expect/cli-big-table.exp b/tests/scripts/expect/cli-big-table.exp index ee0631191..27659e6f2 100755 --- a/tests/scripts/expect/cli-big-table.exp +++ b/tests/scripts/expect/cli-big-table.exp @@ -50,7 +50,7 @@ for {set i 2} {$i <= $max_node} {incr i} { expect_after { timeout { exit 1 } } - send "mode rs\n" + send "mode r\n" expect "Done" send "panid 0xface\n" expect "Done" diff --git a/tests/scripts/expect/cli-child.exp b/tests/scripts/expect/cli-child.exp index a6300382e..f54e8b0f9 100755 --- a/tests/scripts/expect/cli-child.exp +++ b/tests/scripts/expect/cli-child.exp @@ -46,9 +46,9 @@ expect "Done" set spawn_id $spawn_1 send "child table\n" -expect "| ID | RLOC16 | Timeout | Age | LQ In | C_VN |R|S|D|N| Extended MAC |" -expect "+-----+--------+------------+------------+-------+------+-+-+-+-+------------------+" -expect -re "\\| +(\\d+) \\| 0x$rloc \\| +\\d+ \\| +\\d+ \\| +\\d+ \\| +\\d+ \\|\\d\\|\\d\\|\\d\\|\\d\\| $extaddr \\|" +expect "| ID | RLOC16 | Timeout | Age | LQ In | C_VN |R|D|N| Extended MAC |" +expect "+-----+--------+------------+------------+-------+------+-+-+-+------------------+" +expect -re "\\| +(\\d+) \\| 0x$rloc \\| +\\d+ \\| +\\d+ \\| +\\d+ \\| +\\d+ \\|\\d\\|\\d\\|\\d\\| $extaddr \\|" set child_id $expect_out(1,string) expect "Done" send "child list\n" diff --git a/tests/scripts/expect/cli-discerner.exp b/tests/scripts/expect/cli-discerner.exp index 32c28c88e..ad67375a6 100755 --- a/tests/scripts/expect/cli-discerner.exp +++ b/tests/scripts/expect/cli-discerner.exp @@ -61,7 +61,7 @@ expect "Done" set spawn_2 [spawn_node 2] set spawn_id $spawn_2 -send "mode rs\n" +send "mode r\n" expect "Done" send "ifconfig up\n" expect "Done" diff --git a/tests/scripts/expect/cli-misc.exp b/tests/scripts/expect/cli-misc.exp index f85c58f14..a8467ce1f 100755 --- a/tests/scripts/expect/cli-misc.exp +++ b/tests/scripts/expect/cli-misc.exp @@ -87,10 +87,10 @@ send "leaderweight\n" expect "1" expect "Done" -send "mode rsdn\n" +send "mode rdn\n" expect "Done" send "mode\n" -expect -re "(?=.*r)(?=.*s)(?=.*d)(?=.*n)" +expect -re "(?=.*r)(?=.*d)(?=.*n)" send "parent\n" expect "Done" diff --git a/tests/scripts/expect/cli-neighbor.exp b/tests/scripts/expect/cli-neighbor.exp index b09b832b4..77f4b4da8 100755 --- a/tests/scripts/expect/cli-neighbor.exp +++ b/tests/scripts/expect/cli-neighbor.exp @@ -46,9 +46,9 @@ expect "Done" set spawn_id $spawn_1 send "neighbor table\n" -expect "| Role | RLOC16 | Age | Avg RSSI | Last RSSI |R|S|D|N| Extended MAC |" -expect "+------+--------+-----+----------+-----------+-+-+-+-+------------------+" -expect -re "\\| +C +\\| 0x$rloc \\| +\\d+ \\| +-?\\d+ \\| +-?\\d+ \\|1\\|1\\|0\\|0\\| $extaddr \\|" +expect "| Role | RLOC16 | Age | Avg RSSI | Last RSSI |R|D|N| Extended MAC |" +expect "+------+--------+-----+----------+-----------+-+-+-+------------------+" +expect -re "\\| +C +\\| 0x$rloc \\| +\\d+ \\| +-?\\d+ \\| +-?\\d+ \\|1\\|0\\|0\\| $extaddr \\|" expect "Done" send "neighbor list\n" expect "0x$rloc" diff --git a/tests/scripts/expect/cli-router.exp b/tests/scripts/expect/cli-router.exp index ca40a2e89..bb7e6a005 100755 --- a/tests/scripts/expect/cli-router.exp +++ b/tests/scripts/expect/cli-router.exp @@ -54,7 +54,7 @@ expect -re "\\| +$router_id \\| 0x$rloc \\| +\\d+ \\| +\\d+ \\| +\\d+ \\| +\\d+ expect "Done" set spawn_id $spawn_2 -send "mode rsdn\n" +send "mode rdn\n" expect "Done" send "state router\n" expect "Done" diff --git a/tests/scripts/expect/cli-routereligible.exp b/tests/scripts/expect/cli-routereligible.exp index d97937174..0e2b2df8f 100755 --- a/tests/scripts/expect/cli-routereligible.exp +++ b/tests/scripts/expect/cli-routereligible.exp @@ -43,7 +43,7 @@ expect "Enabled" expect "Done" send "routereligible something_invalid\n" expect "Error 7: InvalidArgs" -send "mode rs\n" +send "mode r\n" expect "Done" send "routereligible\n" expect "Disabled" diff --git a/tests/scripts/expect/v1_2-rcp.exp b/tests/scripts/expect/v1_2-rcp.exp index 9edac4937..16ae0207f 100755 --- a/tests/scripts/expect/v1_2-rcp.exp +++ b/tests/scripts/expect/v1_2-rcp.exp @@ -54,7 +54,7 @@ expect_after { send "panid 0xface\n" expect "Done" -send "mode s\n" +send "mode -\n" expect "Done" send "csl period 5000\n" expect "Done" diff --git a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py index ff119d61f..07942ee59 100755 --- a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py @@ -40,12 +40,12 @@ ROUTER = 2 class Cert_5_1_01_RouterAttach(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py index c3f0829e7..7a31b2c22 100755 --- a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py @@ -44,26 +44,26 @@ MTDS = [ED, SED] class Cert_5_1_02_ChildAddressTimeout(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED, SED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, SED: { 'is_mtd': True, - 'mode': 'sn', + 'mode': 'n', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py index 97fda114e..8f296bd85 100755 --- a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py @@ -41,18 +41,18 @@ ROUTER2 = 3 class Cert_5_1_03_RouterAddressReallocation(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py index f5a098535..66216bf98 100755 --- a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py @@ -41,18 +41,18 @@ ROUTER2 = 3 class Cert_5_1_04_RouterAddressReallocation(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py index 8675bf7ae..49907dd44 100755 --- a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py @@ -40,12 +40,12 @@ ROUTER1 = 2 class Cert_5_1_05_RouterAddressTimeout(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py index 53367d907..027c333c5 100755 --- a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py +++ b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py @@ -41,12 +41,12 @@ ROUTER1 = 2 class Cert_5_1_06_RemoveRouterId(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py index f1a310b22..da1b1475b 100755 --- a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py +++ b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py @@ -43,14 +43,14 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'max_children': 10, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, 3, 4, 5, 6, SED1, 8, 9, 10, 11, 12] @@ -58,7 +58,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 3: { 'name': 'MED1', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -66,7 +66,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 4: { 'name': 'MED2', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -74,7 +74,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 5: { 'name': 'MED3', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -82,7 +82,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 6: { 'name': 'MED4', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -90,7 +90,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): SED1: { 'name': 'SED1', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -98,7 +98,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 8: { 'name': 'SED2', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -106,7 +106,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 9: { 'name': 'SED3', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -114,7 +114,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 10: { 'name': 'SED4', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -122,7 +122,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 11: { 'name': 'SED5', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] @@ -130,7 +130,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 12: { 'name': 'SED6', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py index 9272f3a34..907eb53fd 100755 --- a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py @@ -43,30 +43,30 @@ ROUTER4 = 5 class Cert_5_1_08_RouterAttachConnectivity(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER4] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, ROUTER4] }, ROUTER4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER2, ROUTER3] diff --git a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py index ee0511ef1..cea0d98fe 100755 --- a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py @@ -43,30 +43,30 @@ ROUTER2 = 5 class Cert_5_1_09_REEDAttachConnectivity(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, REED0, REED1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, REED0: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER2] }, REED1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [REED0, REED1] diff --git a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py index c328c1f24..abbd5a6a3 100755 --- a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py @@ -41,24 +41,24 @@ ROUTER3 = 4 class Cert_5_1_10_RouterAttachLinkQuality(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, (ROUTER3, -85)] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py index 240ea5716..668dfcc75 100755 --- a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py @@ -41,24 +41,24 @@ ROUTER1 = 4 class Cert_5_1_11_REEDAttachLinkQuality(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [REED, ROUTER2] }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, (ROUTER1, -85)] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [REED, ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py index bae6b2f1a..18abb4900 100755 --- a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py +++ b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py @@ -40,18 +40,18 @@ ROUTER2 = 3 class Cert_5_1_12_NewRouterSync(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py index d791b592a..491b83b4b 100755 --- a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py +++ b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py @@ -39,12 +39,12 @@ ROUTER = 2 class Cert_5_1_13_RouterReset(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py index eab15c30c..a9f7f22b2 100755 --- a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py +++ b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py @@ -43,18 +43,18 @@ MED1 = 4 class Cert_5_2_01_REEDAttach(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, REED1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'router_upgrade_threshold': 1, @@ -62,7 +62,7 @@ class Cert_5_2_01_REEDAttach(thread_cert.TestCase): }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [REED1] }, diff --git a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py index ade0c0503..4d8e65207 100755 --- a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py +++ b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py @@ -43,7 +43,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): TOPOLOGY = { DUT_LEADER: { 'mode': - 'rsdn', + 'rdn', 'panid': 0xface, 'router_downgrade_threshold': @@ -56,7 +56,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): ] }, ROUTER_1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -64,7 +64,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER, ROUTER_32] }, 3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -72,7 +72,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -80,7 +80,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -88,7 +88,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -96,7 +96,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -104,7 +104,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -112,7 +112,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -120,7 +120,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -128,7 +128,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -136,7 +136,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -144,7 +144,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -152,7 +152,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -160,7 +160,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -168,7 +168,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 16: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -176,7 +176,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 17: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -184,7 +184,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 18: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -192,7 +192,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 19: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -200,7 +200,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 20: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -208,7 +208,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 21: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -216,7 +216,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 22: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -224,7 +224,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 23: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -232,7 +232,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 24: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -240,7 +240,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 25: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -248,7 +248,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 26: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -256,7 +256,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 27: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -264,7 +264,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 28: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -272,7 +272,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 29: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -280,7 +280,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 30: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -288,7 +288,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, 31: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -296,7 +296,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, ROUTER_31: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, @@ -304,7 +304,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): 'allowlist': [DUT_LEADER] }, ROUTER_32: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 33, 'router_selection_jitter': 1, diff --git a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py index 3d1e1ffbc..09bc97c2e 100755 --- a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py @@ -47,108 +47,108 @@ ROUTER_SELECTION_JITTER = 1 class Cert_5_2_4_REEDUpgrade(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER] }, 2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_REED] }, DUT_REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER, ED] }, ED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_REED] }, diff --git a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py index d91461eaa..4ef7e5541 100755 --- a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py @@ -44,108 +44,108 @@ ROUTER_SELECTION_JITTER = 1 class Cert_5_2_5_AddressQuery(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, BR, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ED1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_REED] }, BR: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 16: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, DUT_REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py b/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py index ab6e22cb2..89fd91672 100755 --- a/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py @@ -43,166 +43,166 @@ ROUTER24 = 24 class Cert_5_2_06_RouterDowngrade(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 16: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 17: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 18: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 19: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 20: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 21: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 22: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 23: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, ROUTER24: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, diff --git a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py index 40b877de9..fba322191 100755 --- a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py @@ -45,87 +45,87 @@ MLE_MIN_LINKS = 3 class Cert_5_2_7_REEDSynchronization(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, 16: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, DUT_REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, diff --git a/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py index 8b7db323c..0e64a03fb 100755 --- a/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py @@ -39,11 +39,11 @@ DUT_ROUTER1 = 2 class Cert_5_3_1_LinkLocal(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, diff --git a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py index 869e6d0f6..737927e29 100755 --- a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py @@ -41,25 +41,25 @@ SED1 = 4 class Cert_5_3_2_RealmLocal(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, DUT_ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1, SED1] }, SED1: { 'is_mtd': True, - 'mode': 'sn', + 'mode': 'n', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [DUT_ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py index 2fa23d8da..ce614c082 100755 --- a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py @@ -44,31 +44,31 @@ MED1_TIMEOUT = 3 class Cert_5_3_3_AddressQuery(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, DUT_ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3, MED1] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': 3, 'allowlist': [DUT_ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py index 6580fc02d..495cc0b1f 100755 --- a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py +++ b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py @@ -47,44 +47,44 @@ MTDS = [SED1, ED1, ED2, ED3, ED4] class Cert_5_3_4_AddressMapCache(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1, ED1, ED2, ED3, ED4] }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, SED1] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': 5, 'allowlist': [DUT_ROUTER1] }, ED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, ED2: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, ED3: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, ED4: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py index d6631c4a6..d227ee634 100755 --- a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py @@ -42,24 +42,24 @@ ROUTER3 = 4 class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1, ROUTER2] }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2, ROUTER3] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER1] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py index c3627572e..8ae34d77c 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py @@ -42,18 +42,18 @@ ROUTER2 = 3 class Cert_5_3_6_RouterIdMask(thread_cert.TestCase): TOPOLOGY = { DUT_LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py index 66074c6dc..ea94e2ada 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py @@ -39,18 +39,18 @@ ROUTER2 = 3 class Cert_5_3_6_RouterIdMask(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py index 5130b0756..3abb1e40d 100755 --- a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py +++ b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py @@ -47,37 +47,37 @@ MTDS = [MED1, SED1, MED3] class Cert_5_3_7_DuplicateAddress(thread_cert.TestCase): TOPOLOGY = { DUT_LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, MED3] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, MED1] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, SED1] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'allowlist': [ROUTER2] }, MED3: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [DUT_LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py index 8bee8e06d..ce76be527 100755 --- a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py +++ b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py @@ -46,25 +46,25 @@ MTDS = [MED1, MED2] class Cert_5_3_8_ChildAddressSet(thread_cert.TestCase): TOPOLOGY = { DUT_LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [BR, MED1, MED2] }, BR: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [DUT_LEADER] }, MED2: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [DUT_LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py index 2e5eca97c..e1aec98e1 100755 --- a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py @@ -45,31 +45,31 @@ SED1 = 5 class Cert_5_3_09_AddressQuery(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, DUT_ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, SED1] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [DUT_ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py index 069569a58..d1f1c4144 100755 --- a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py @@ -47,31 +47,31 @@ class Cert_5_3_10_AddressQuery(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [BR, ROUTER1, DUT_ROUTER2] }, BR: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, DUT_ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, MED1] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [DUT_ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py index cb5f10beb..885cb949a 100755 --- a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py +++ b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py @@ -41,19 +41,19 @@ MED1 = 3 class Cert_5_3_11_AddressQueryTimeoutIntervals(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, MED1] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py index 06a9957c8..7b962c8cc 100755 --- a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py @@ -42,12 +42,12 @@ DUT_ROUTER1 = 2 class Cert_5_5_1_LeaderReboot(thread_cert.TestCase): TOPOLOGY = { DUT_LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py index 1a3fdf045..8ad6d9467 100755 --- a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py @@ -44,14 +44,14 @@ class Cert_5_5_2_LeaderReboot(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] @@ -59,7 +59,7 @@ class Cert_5_5_2_LeaderReboot(thread_cert.TestCase): ED: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py index aca59380d..c53f6305e 100755 --- a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py +++ b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py @@ -44,38 +44,38 @@ MTDS = [ED1, ED2, ED3] class Cert_5_5_3_SplitMergeChildren(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2, ED1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, ED3] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, ED2: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ED3: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py index 32557c26b..080c3549b 100755 --- a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py +++ b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py @@ -44,35 +44,35 @@ class Cert_5_5_4_SplitMergeRouters(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER4] }, ROUTER3: { 'name': 'ROUTER_3', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, ROUTER4: { 'name': 'ROUTER_4', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py index feaef716a..e695aa59c 100755 --- a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py +++ b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py @@ -45,106 +45,106 @@ class Cert_5_5_5_SplitMergeREED(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, ROUTER3: { 'name': 'ROUTER_3', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, REED1: { 'name': 'REED', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py index 15d7ead0d..58538ffeb 100755 --- a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py +++ b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py @@ -43,28 +43,28 @@ class Cert_5_5_7_SplitMergeThreeWay(thread_cert.TestCase): TOPOLOGY = { LEADER1: { 'name': 'LEADER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, ROUTER3: { 'name': 'ROUTER_3', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER1] diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py index 8045ef5af..fc5055917 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -47,13 +47,13 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] @@ -61,14 +61,14 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py index d8c084c41..ed57d0c9c 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -47,13 +47,13 @@ class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] @@ -61,14 +61,14 @@ class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py index 5e9395be6..e48820484 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -47,13 +47,13 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] @@ -61,14 +61,14 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py index 19295b2cf..be35d6087 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -47,13 +47,13 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] @@ -61,14 +61,14 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py index f4e0425e0..40ee50e6e 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -47,13 +47,13 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] @@ -61,14 +61,14 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py index b3355a5ce..b6c15a934 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -47,13 +47,13 @@ class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] @@ -61,14 +61,14 @@ class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase): ED1: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py index 336c5e471..902203f50 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -45,105 +45,105 @@ class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, ROUTER3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, REED1: { 'name': 'REED', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py index ecdd57cfb..20812d194 100755 --- a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py +++ b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py @@ -48,20 +48,20 @@ class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED, SED] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] @@ -69,14 +69,14 @@ class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase): ED: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, SED: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py index 1aadbad72..e4b8a9231 100755 --- a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py +++ b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py @@ -64,13 +64,13 @@ class Cert_5_7_01_CoapDiagCommands_A(thread_cert.TestCase): }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'allowlist': [ROUTER1], 'timeout': config.DEFAULT_CHILD_TIMEOUT }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'allowlist': [ROUTER1] }, FED1: { diff --git a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py index dc11c0ae9..e156eaee9 100755 --- a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py @@ -42,14 +42,14 @@ class Cert_5_8_2_KeyIncrement(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py index 940e7d07b..d1981329f 100755 --- a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py @@ -43,14 +43,14 @@ class Cert_5_8_3_KeyIncrementRollOver(thread_cert.TestCase): 'name': 'LEADER', 'key_sequence_counter': 127, 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py index 9ef4c008d..edbcffcae 100755 --- a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py @@ -39,13 +39,13 @@ ED = 2 class Cert_6_1_1_RouterAttach(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py index 60d61a227..5b85f61b3 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py @@ -45,19 +45,19 @@ MED = 3 class Cert_6_1_2_REEDAttach_MED(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [REED] }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, MED] }, MED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED] diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py index 62f0d2c89..2d74c07d7 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py @@ -46,19 +46,19 @@ SED = 3 class Cert_6_1_2_REEDAttach_SED(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [REED] }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, SED] }, SED: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED] diff --git a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py index 626d89c25..a01ae2b9d 100755 --- a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py @@ -45,27 +45,27 @@ class Cert_6_1_3_RouterAttachConnectivity(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ROUTER3: { 'name': 'ROUTER_3', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, ED] @@ -73,7 +73,7 @@ class Cert_6_1_3_RouterAttachConnectivity(thread_cert.TestCase): ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER2, ROUTER3] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py index 2410631ca..f51cc0f84 100755 --- a/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py @@ -44,27 +44,27 @@ class Cert_6_1_5_REEDAttachConnectivity(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, REED1, REED2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, REED2] }, REED1: { 'name': 'REED_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1, ED] }, REED2: { 'name': 'REED_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, (ED, -85)] @@ -72,7 +72,7 @@ class Cert_6_1_5_REEDAttachConnectivity(thread_cert.TestCase): ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [REED1, REED2] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py index b6ba8b713..f0df668b6 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py @@ -41,25 +41,25 @@ ED = 4 class Cert_6_1_6_REEDAttachLinkQuality_ED(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [REED, ROUTER2] }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ED] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, (ED, -85)] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [REED, ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py index 9bcbba2e0..04e5b80ec 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py @@ -42,25 +42,25 @@ SED = 4 class Cert_6_1_6_REEDAttachLinkQuality_SED(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [REED, ROUTER2] }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, SED] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, (SED, -85)] }, SED: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED, ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py index 6ce7cc610..318c943c9 100755 --- a/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py @@ -43,20 +43,20 @@ class Cert_6_1_7_RouterAttachLinkQuality(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, (ED, -85)] @@ -64,7 +64,7 @@ class Cert_6_1_7_RouterAttachLinkQuality(thread_cert.TestCase): ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py b/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py index 28bf093ec..2ac47e60c 100755 --- a/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py @@ -44,13 +44,13 @@ class Cert_6_1_9_EDSynchronization(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ED, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED, ROUTER3] @@ -63,14 +63,14 @@ class Cert_6_1_9_EDSynchronization(thread_cert.TestCase): }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED, ROUTER3] }, ROUTER3: { 'name': 'ROUTER_3', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ED, ROUTER1, ROUTER2] diff --git a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py index c29b68cba..d6071f19f 100755 --- a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py @@ -39,19 +39,19 @@ ED = 3 class Cert_6_2_1_NewPartition(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py index fabc45e42..2a0789668 100755 --- a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py @@ -43,20 +43,20 @@ class Cert_6_2_2_NewPartition(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2, ED] }, ROUTER2: { 'name': 'ROUTER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'network_id_timeout': 110, 'panid': 0xface, 'router_selection_jitter': 1, @@ -65,7 +65,7 @@ class Cert_6_2_2_NewPartition(thread_cert.TestCase): ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py index e9d8e2c60..d6ec94210 100755 --- a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py +++ b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py @@ -42,13 +42,13 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] @@ -56,7 +56,7 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase): ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': 10, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py index 68996d765..3d28e53c3 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -41,14 +41,14 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': 10, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py index 13397d23c..43d55735b 100755 --- a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py @@ -38,13 +38,13 @@ ED = 2 class Cert_6_4_1_LinkLocal(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py index a465d81a9..036551c41 100755 --- a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py @@ -39,19 +39,19 @@ ED = 3 class Cert_5_3_2_RealmLocal(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py index 211dd9007..3ec6a5444 100755 --- a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py @@ -41,14 +41,14 @@ class Cert_6_5_1_ChildResetReattach(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py index be45cfc8b..95da5763a 100755 --- a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py @@ -38,13 +38,13 @@ ED = 2 class Cert_6_5_2_ChildResetReattach(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py b/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py index b5d8e54b2..203d20181 100755 --- a/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py +++ b/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py @@ -42,14 +42,14 @@ class Cert_6_5_3_ChildResetSynchronize(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'ED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py index 72504cdbd..10ff33b51 100755 --- a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py @@ -42,7 +42,7 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, @@ -50,7 +50,7 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase): 'name': 'ED', 'is_mtd': True, 'key_switch_guardtime': 0, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py index 1e3c3917f..57aff0fe4 100755 --- a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py @@ -43,7 +43,7 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase): 'name': 'LEADER', 'key_sequence_counter': 127, 'key_switch_guardtime': 0, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ED] }, @@ -51,7 +51,7 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase): 'name': 'ED', 'is_mtd': True, 'key_switch_guardtime': 0, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py index 1733cb77d..65b931d4a 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -53,26 +53,26 @@ MTDS = [SED1, MED1] class Cert_7_1_1_BorderRouterAsLeader(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, SED1, MED1] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py index d37fb2b10..00c9cc4ae 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -47,13 +47,13 @@ class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, SED2] @@ -61,14 +61,14 @@ class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase): ED2: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED2: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py index 01716540c..f828db2bc 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -53,26 +53,26 @@ MTDS = [SED1, MED1] class Cert_7_1_3_BorderRouterAsLeader(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, SED1, MED1] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, MED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py index 41e772772..496b3d98b 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -47,13 +47,13 @@ class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, SED2] @@ -61,14 +61,14 @@ class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase): ED2: { 'name': 'MED', 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED2: { 'name': 'SED', 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py index c74cb3d39..1b15f3c32 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -43,25 +43,25 @@ MTDS = [ED2, SED2] class Cert_7_1_5_BorderRouterAsRouter(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, SED2] }, ED2: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED2: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py b/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py index d998d49a0..de1c11b54 100755 --- a/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py @@ -46,12 +46,12 @@ class Cert_8_1_01_Commissioning(thread_cert.TestCase): TOPOLOGY = { COMMISSIONER: { 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface }, JOINER: { 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py b/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py index 460fc214f..ba0395516 100755 --- a/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py @@ -44,13 +44,13 @@ class Cert_8_1_02_Commissioning(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py index 1fe3d8d81..04d33faf0 100755 --- a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py @@ -45,20 +45,20 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, JOINER_ROUTER: { 'name': 'JOINER_ROUTER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, JOINER: { 'name': 'JOINER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py index 5497da878..491162b8b 100755 --- a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py @@ -45,20 +45,20 @@ class Cert_8_2_02_JoinerRouter(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, JOINER_ROUTER: { 'name': 'JOINER_ROUTER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, JOINER: { 'name': 'JOINER', 'masterkey': '00112233445566778899aabbccddeeff', - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py index 22e01249a..6507f819b 100755 --- a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py +++ b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py @@ -44,13 +44,13 @@ class Cert_9_2_02_MGMTCommissionerSet(thread_cert.TestCase): TOPOLOGY = { COMMISSIONER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] diff --git a/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py b/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py index e1d66997f..82b1e1565 100755 --- a/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py +++ b/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py @@ -48,7 +48,7 @@ class Cert_9_2_04_ActiveDataset(thread_cert.TestCase): 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff' }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -59,7 +59,7 @@ class Cert_9_2_04_ActiveDataset(thread_cert.TestCase): 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff' }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py index 2fb10abdb..73ea7db3d 100755 --- a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py +++ b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py @@ -54,13 +54,13 @@ class Cert_9_2_7_DelayTimer(thread_cert.TestCase): 'active_dataset': { 'timestamp': LEADER_ACTIVE_TIMESTAMP }, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'partition_id': 0xffffffff, 'router_selection_jitter': 1, @@ -70,7 +70,7 @@ class Cert_9_2_7_DelayTimer(thread_cert.TestCase): 'active_dataset': { 'timestamp': ROUTER_ACTIVE_TIMESTAMP }, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'partition_id': 1, 'pending_dataset': { diff --git a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py index 615897275..f9dd28abd 100755 --- a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py +++ b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py @@ -58,7 +58,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -68,7 +68,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'allowlist': [COMMISSIONER, ROUTER, ED, SED] }, ROUTER: { @@ -77,14 +77,14 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED: { 'channel': CHANNEL_INIT, 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] @@ -92,7 +92,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): SED: { 'channel': CHANNEL_INIT, 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py index a81f71b3b..ba47ee7e3 100755 --- a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py @@ -53,7 +53,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -63,7 +63,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] @@ -74,7 +74,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, @@ -84,7 +84,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_id_timeout': 100, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py index 1b4afa3e6..3106ce8c0 100755 --- a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py @@ -60,7 +60,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'panid': 0xface, 'channel': 19 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -71,7 +71,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'panid': 0xface, 'channel': 19 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] @@ -83,7 +83,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'panid': 0xface, 'channel': 19 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, @@ -91,7 +91,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'name': 'MED', 'channel': 19, 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER1] }, @@ -99,7 +99,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'name': 'SED', 'channel': 19, 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py index a3572d5e6..6404d548c 100755 --- a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py +++ b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py @@ -58,7 +58,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': '000102030405060708090a0b0c0d0e0f' }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -69,7 +69,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': '000102030405060708090a0b0c0d0e0f' }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, @@ -80,7 +80,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': '000102030405060708090a0b0c0d0e0f' }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, @@ -88,7 +88,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'is_mtd': True, 'masterkey': '000102030405060708090a0b0c0d0e0f', - 'mode': 'rsn', + 'mode': 'rn', 'panid': PANID_INIT, 'allowlist': [ROUTER1] }, @@ -96,7 +96,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'is_mtd': True, 'masterkey': '000102030405060708090a0b0c0d0e0f', - 'mode': 's', + 'mode': '-', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py index 50cebddca..b895cff22 100755 --- a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py +++ b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py @@ -56,7 +56,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'panid': DATASET1_PANID, 'channel': DATASET1_CHANNEL }, - 'mode': 'rsdn', + 'mode': 'rdn', 'allowlist': [ROUTER1] }, ROUTER1: { @@ -65,7 +65,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'panid': DATASET1_PANID, 'channel': DATASET1_CHANNEL }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER1, LEADER2] }, @@ -75,7 +75,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'panid': DATASET2_PANID, 'channel': DATASET2_CHANNEL }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] }, @@ -85,14 +85,14 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'panid': DATASET2_PANID, 'channel': DATASET2_CHANNEL }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER2, MED] }, MED: { 'channel': DATASET2_CHANNEL, 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': DATASET2_PANID, 'allowlist': [ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py index 5117403c7..426847e4f 100755 --- a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py +++ b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py @@ -42,25 +42,25 @@ class Cert_9_2_13_EnergyScan(thread_cert.TestCase): TOPOLOGY = { COMMISSIONER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1] }, ED1: { 'is_mtd': True, - 'mode': 'rs', + 'mode': 'r', 'panid': 0xface, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py index 6ee32d614..52582cc95 100755 --- a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py +++ b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py @@ -45,27 +45,27 @@ class Cert_9_2_14_PanIdQuery(thread_cert.TestCase): TOPOLOGY = { COMMISSIONER: { 'name': 'COMMISSIONER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, LEADER1: { 'name': 'LEADER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER1, LEADER2] }, LEADER2: { 'name': 'LEADER_2', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xdead, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py index 47b0f335a..654393e15 100755 --- a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py @@ -55,7 +55,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -66,7 +66,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] @@ -78,7 +78,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, @@ -89,7 +89,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py index 03301f32d..07a8df6bb 100755 --- a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py @@ -56,7 +56,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -67,7 +67,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] @@ -79,7 +79,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, @@ -90,7 +90,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'panid': PANID_INIT, 'channel': CHANNEL_INIT }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py index 577b5d882..d9905ad12 100755 --- a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py +++ b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py @@ -56,7 +56,7 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): 'channel': CHANNEL1, 'channel_mask': CHANNEL_MASK }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [ED1] }, @@ -68,14 +68,14 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): 'channel': CHANNEL2, 'channel_mask': CHANNEL_MASK }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1 }, ED1: { 'name': 'ED', 'channel': CHANNEL1, 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER1] diff --git a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py index 42491c7cc..12e5a38d0 100755 --- a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py +++ b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py @@ -62,7 +62,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': KEY1 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER] }, @@ -74,7 +74,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': KEY1 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] @@ -87,7 +87,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'master_key': KEY1 }, - 'mode': 'rsdn', + 'mode': 'rdn', 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, @@ -96,7 +96,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'is_mtd': True, 'masterkey': KEY1, - 'mode': 'rsn', + 'mode': 'rn', 'panid': PANID_INIT, 'allowlist': [ROUTER1] }, @@ -105,7 +105,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'channel': CHANNEL_INIT, 'is_mtd': True, 'masterkey': KEY1, - 'mode': 's', + 'mode': '-', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/Test_MacScan.py b/tests/scripts/thread-cert/Test_MacScan.py index d74763725..19aa4e82a 100755 --- a/tests/scripts/thread-cert/Test_MacScan.py +++ b/tests/scripts/thread-cert/Test_MacScan.py @@ -40,14 +40,14 @@ class Test_MacScan(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'channel': 12, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_name': 'OpenThread', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'channel': 12, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_name': 'OpenThread', 'panid': 0xface, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/test_coap_observe.py b/tests/scripts/thread-cert/test_coap_observe.py index 55221c75e..cab7445cf 100755 --- a/tests/scripts/thread-cert/test_coap_observe.py +++ b/tests/scripts/thread-cert/test_coap_observe.py @@ -46,12 +46,12 @@ class TestCoapObserve(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/test_coaps.py b/tests/scripts/thread-cert/test_coaps.py index 55e651013..d678ec049 100755 --- a/tests/scripts/thread-cert/test_coaps.py +++ b/tests/scripts/thread-cert/test_coaps.py @@ -41,12 +41,12 @@ class TestCoaps(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/test_ipv6_fragmentation.py b/tests/scripts/thread-cert/test_ipv6_fragmentation.py index 09b21db73..c7b565d62 100755 --- a/tests/scripts/thread-cert/test_ipv6_fragmentation.py +++ b/tests/scripts/thread-cert/test_ipv6_fragmentation.py @@ -42,12 +42,12 @@ class TestIPv6Fragmentation(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xcafe, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xcafe, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/test_ipv6_source_selection.py b/tests/scripts/thread-cert/test_ipv6_source_selection.py index af7fd119b..e32e37dc9 100755 --- a/tests/scripts/thread-cert/test_ipv6_source_selection.py +++ b/tests/scripts/thread-cert/test_ipv6_source_selection.py @@ -41,12 +41,12 @@ class TestIPv6SourceSelection(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xcafe, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xcafe, 'router_selection_jitter': 1, 'allowlist': [LEADER] diff --git a/tests/scripts/thread-cert/test_on_mesh_prefix.py b/tests/scripts/thread-cert/test_on_mesh_prefix.py index 688a65c39..5e40498d9 100755 --- a/tests/scripts/thread-cert/test_on_mesh_prefix.py +++ b/tests/scripts/thread-cert/test_on_mesh_prefix.py @@ -43,25 +43,25 @@ MTDS = [ED1, SED1] class Test_OnMeshPrefix(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'is_mtd': True, - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] diff --git a/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py b/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py index f3bc9d4c6..0b1aa02ff 100755 --- a/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py +++ b/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py @@ -51,11 +51,11 @@ class TestREEDAddressSolicitRejected(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface }, REED: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1 }, diff --git a/tests/scripts/thread-cert/test_reset.py b/tests/scripts/thread-cert/test_reset.py index e56fb4f46..226527989 100755 --- a/tests/scripts/thread-cert/test_reset.py +++ b/tests/scripts/thread-cert/test_reset.py @@ -39,19 +39,19 @@ SED = 4 class TestReset(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'is_mtd': True, - 'mode': 'rsn', + 'mode': 'rn', 'panid': 0xface, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/test_route_table.py b/tests/scripts/thread-cert/test_route_table.py index f23d9dc95..a8965f247 100755 --- a/tests/scripts/thread-cert/test_route_table.py +++ b/tests/scripts/thread-cert/test_route_table.py @@ -45,18 +45,18 @@ class TestRouteTable(thread_cert.TestCase): TOPOLOGY = { LEADER: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [ROUTER1] diff --git a/tests/scripts/thread-cert/test_router_reattach.py b/tests/scripts/thread-cert/test_router_reattach.py index 7ab7132c6..d20413f37 100755 --- a/tests/scripts/thread-cert/test_router_reattach.py +++ b/tests/scripts/thread-cert/test_router_reattach.py @@ -36,224 +36,224 @@ import thread_cert class test_router_reattach(thread_cert.TestCase): TOPOLOGY = { 1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 2: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 3: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 4: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 5: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 6: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 7: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 8: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 9: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 10: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 11: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 12: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 13: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 14: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 15: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 16: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 17: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 18: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 19: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 20: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 21: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 22: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 23: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 24: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 25: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 26: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 27: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 28: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 29: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 30: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 31: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 32: { - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_downgrade_threshold': 32, 'router_selection_jitter': 1, diff --git a/tests/scripts/thread-cert/test_service.py b/tests/scripts/thread-cert/test_service.py index 5f8b77ea5..bdafc0923 100755 --- a/tests/scripts/thread-cert/test_service.py +++ b/tests/scripts/thread-cert/test_service.py @@ -54,14 +54,14 @@ class Test_Service(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'channel': 12, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_name': 'OpenThread', 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'channel': 12, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_name': 'OpenThread', 'panid': 0xface, 'router_selection_jitter': 1, @@ -69,7 +69,7 @@ class Test_Service(thread_cert.TestCase): }, ROUTER2: { 'channel': 12, - 'mode': 'rsdn', + 'mode': 'rdn', 'network_name': 'OpenThread', 'panid': 0xface, 'router_selection_jitter': 1, diff --git a/tests/scripts/thread-cert/thread_cert.py b/tests/scripts/thread-cert/thread_cert.py index dab0410d9..e311fa8b3 100644 --- a/tests/scripts/thread-cert/thread_cert.py +++ b/tests/scripts/thread-cert/thread_cert.py @@ -58,7 +58,7 @@ DEFAULT_PARAMS = { 'is_bbr': False, 'is_otbr': False, 'is_host': False, - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': None, 'version': ENV_THREAD_VERSION, diff --git a/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py b/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py index 0f1dd86b6..623cc5d62 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py @@ -46,14 +46,14 @@ class LowPower_5_3_01_SSEDAttachment(thread_cert.TestCase): LEADER: { 'version': '1.2', 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER, SSED_1] }, ROUTER: { 'version': '1.2', 'name': 'ROUTER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER], @@ -61,7 +61,7 @@ class LowPower_5_3_01_SSEDAttachment(thread_cert.TestCase): SSED_1: { 'version': '1.2', 'name': 'SSED_1', - 'mode': 's', + 'mode': '-', 'panid': 0xface, 'allowlist': [LEADER], }, diff --git a/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py b/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py index 38f0e64a9..9da18f5af 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py @@ -48,14 +48,14 @@ class LowPower_6_1_07_PreferringARouterOverAReed_Base(thread_cert.TestCase): LEADER: { 'version': '1.2', 'name': 'LEADER', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'allowlist': [ROUTER_1, REED_1] }, ROUTER_1: { 'version': '1.1', 'name': 'ROUTER_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT], @@ -63,7 +63,7 @@ class LowPower_6_1_07_PreferringARouterOverAReed_Base(thread_cert.TestCase): REED_1: { 'version': '1.2', 'name': 'REED_1', - 'mode': 'rsdn', + 'mode': 'rdn', 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, DUT], @@ -162,12 +162,12 @@ class LowPower_6_1_07_PreferringARouterOverAReed_Base(thread_cert.TestCase): class LowPower_6_1_07_PreferringARouterOverAReed_MED(LowPower_6_1_07_PreferringARouterOverAReed_Base): TOPOLOGY = copy.deepcopy(LowPower_6_1_07_PreferringARouterOverAReed_Base.TOPOLOGY) - TOPOLOGY[DUT]['mode'] = 'rsn' + TOPOLOGY[DUT]['mode'] = 'rn' class LowPower_6_1_07_PreferringARouterOverAReed_SED(LowPower_6_1_07_PreferringARouterOverAReed_Base): TOPOLOGY = copy.deepcopy(LowPower_6_1_07_PreferringARouterOverAReed_Base.TOPOLOGY) - TOPOLOGY[DUT]['mode'] = 's' + TOPOLOGY[DUT]['mode'] = '-' del (LowPower_6_1_07_PreferringARouterOverAReed_Base) diff --git a/tests/scripts/thread-cert/v1_2_test_csl_transmission.py b/tests/scripts/thread-cert/v1_2_test_csl_transmission.py index e79a05261..352ad4777 100755 --- a/tests/scripts/thread-cert/v1_2_test_csl_transmission.py +++ b/tests/scripts/thread-cert/v1_2_test_csl_transmission.py @@ -47,7 +47,7 @@ class SSED_CslTransmission(thread_cert.TestCase): }, SSED_1: { 'version': '1.2', - 'mode': 's', + 'mode': '-', }, } """All nodes are created with default configurations""" diff --git a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py index 89b7901d8..9b045fd2d 100755 --- a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py +++ b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py @@ -115,12 +115,12 @@ class TestDomainUnicastAddress(thread_cert.TestCase): 'allowlist': [BBR_1, MED_1_2] }, MED_1_2: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_2], }, SED_1_2: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [ROUTER_1_1], }, diff --git a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py index e27e8b8af..413df0295 100755 --- a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py @@ -130,12 +130,12 @@ class TestDomainUnicastAddressRegistration(thread_cert.TestCase): 'allowlist': [ROUTER_1_1], }, MED_1_2_1: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_1], }, SED_1_2_1: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [ROUTER_1_1], }, @@ -144,12 +144,12 @@ class TestDomainUnicastAddressRegistration(thread_cert.TestCase): 'allowlist': [ROUTER_1_2], }, MED_1_2_2: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_2], }, SED_1_2_2: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [ROUTER_1_2], }, diff --git a/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py b/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py index beeb90824..68aefc831 100755 --- a/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py +++ b/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py @@ -76,12 +76,12 @@ class TestDomainUnicastAddress(thread_cert.TestCase): 'version': '1.2', 'allowlist': [ROUTER], 'router_eligible': False, - 'mode': 'rsdn', + 'mode': 'rdn', }, MED: { 'version': '1.2', 'allowlist': [ROUTER], - 'mode': 'rsn', + 'mode': 'rn', }, } diff --git a/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py b/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py index f978a395f..92eb180e1 100755 --- a/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py +++ b/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py @@ -64,7 +64,7 @@ class SED_EnhancedFramePending(thread_cert.TestCase): 'version': '1.2' }, SED_1: { - 'mode': 's', + 'mode': '-', 'version': '1.2', }, } diff --git a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py index 60d326312..80270d275 100755 --- a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py +++ b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py @@ -50,7 +50,7 @@ class SED_EnhancedKeepAlive(thread_cert.TestCase): 'version': '1.2' }, SED_1: { - 'mode': 's', + 'mode': '-', 'version': '1.2', }, } diff --git a/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py b/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py index 78bf24ee8..53654d498 100755 --- a/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py @@ -97,25 +97,25 @@ class TestMulticastListenerRegistration(thread_cert.TestCase): 'router_selection_jitter': 1, }, MED_1: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, MED_2: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, SED_1: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, FED_1: { - 'mode': 'rsdn', + 'mode': 'rdn', 'version': '1.2', 'allowlist': [ROUTER_1_2], 'router_upgrade_threshold': 0, diff --git a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py index 52c594823..afed08439 100755 --- a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py @@ -101,22 +101,22 @@ class TestMulticastRegistration(thread_cert.TestCase): 'allowlist': [MED_1_2, SED_1_2, MED_1_1, SED_1_1, ROUTER_1_1], }, MED_1_2: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [LEADER_1_2], }, SED_1_2: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [LEADER_1_2], }, MED_1_1: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.1', 'allowlist': [LEADER_1_2], }, SED_1_1: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.1', 'allowlist': [LEADER_1_2], }, @@ -125,12 +125,12 @@ class TestMulticastRegistration(thread_cert.TestCase): 'allowlist': [LEADER_1_2, MED_1_2_2, SED_1_2_2], }, MED_1_2_2: { - 'mode': 'rsn', + 'mode': 'rn', 'version': '1.2', 'allowlist': [ROUTER_1_1], }, SED_1_2_2: { - 'mode': 'sn', + 'mode': 'n', 'version': '1.2', 'allowlist': [ROUTER_1_1], }, diff --git a/tests/scripts/thread-cert/v1_2_test_parent_selection.py b/tests/scripts/thread-cert/v1_2_test_parent_selection.py index 91a30b57f..154d400fb 100755 --- a/tests/scripts/thread-cert/v1_2_test_parent_selection.py +++ b/tests/scripts/thread-cert/v1_2_test_parent_selection.py @@ -91,12 +91,12 @@ class TestParentSelection(thread_cert.TestCase): 'allowlist': [ROUTER_1_2, LEADER_1_2] }, MED_1_1: { - 'mode': 'rs', + 'mode': 'r', 'version': '1.1', 'allowlist': [LEADER_1_2, ROUTER_1_1], }, MED_1_2: { - 'mode': 'rs', + 'mode': 'r', 'version': '1.2', 'allowlist': [ROUTER_1_1, ROUTER_1_2], }, diff --git a/tests/scripts/thread-cert/v1_2_test_single_probe.py b/tests/scripts/thread-cert/v1_2_test_single_probe.py index 8a1139854..899ee503a 100755 --- a/tests/scripts/thread-cert/v1_2_test_single_probe.py +++ b/tests/scripts/thread-cert/v1_2_test_single_probe.py @@ -46,7 +46,7 @@ class SSED_SingleProbe(thread_cert.TestCase): }, SSED_1: { 'version': '1.2', - 'mode': 's', + 'mode': '-', }, } """All nodes are created with default configurations""" diff --git a/tests/toranj/test-027-child-mode-change.py b/tests/toranj/test-027-child-mode-change.py index e0a3b1dd2..b3c92c6e8 100644 --- a/tests/toranj/test-027-child-mode-change.py +++ b/tests/toranj/test-027-child-mode-change.py @@ -62,7 +62,6 @@ def verify_child_table(parent, children): verify(entry.is_rx_on_when_idle() == (mode & wpan.THREAD_MODE_FLAG_RX_ON_WHEN_IDLE != 0)) verify(entry.is_ftd() == (mode & wpan.THREAD_MODE_FLAG_FULL_THREAD_DEV != 0)) verify(entry.is_full_net_data() == (mode & wpan.THREAD_MODE_FLAG_FULL_NETWORK_DATA != 0)) - verify(entry.is_sec_data_req() == (mode & wpan.THREAD_MODE_FLAG_SECURE_DATA_REQUEST != 0)) # ----------------------------------------------------------------------------------------------------------------------- @@ -100,9 +99,9 @@ children = [child1, child2] WAIT_INTERVAL = 6 # Thread Mode for end-device and sleepy end-device -DEVICE_MODE_SLEEPY_END_DEVICE = (wpan.THREAD_MODE_FLAG_FULL_NETWORK_DATA | wpan.THREAD_MODE_FLAG_SECURE_DATA_REQUEST) +DEVICE_MODE_SLEEPY_END_DEVICE = (wpan.THREAD_MODE_FLAG_FULL_NETWORK_DATA) DEVICE_MODE_END_DEVICE = (wpan.THREAD_MODE_FLAG_FULL_NETWORK_DATA | wpan.THREAD_MODE_FLAG_FULL_THREAD_DEV | - wpan.THREAD_MODE_FLAG_SECURE_DATA_REQUEST | wpan.THREAD_MODE_FLAG_RX_ON_WHEN_IDLE) + wpan.THREAD_MODE_FLAG_RX_ON_WHEN_IDLE) # Disable child supervision on all devices parent.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, '0') diff --git a/tests/toranj/test-040-network-data-stable-full.py b/tests/toranj/test-040-network-data-stable-full.py index 3029bbe35..0f2755ff9 100644 --- a/tests/toranj/test-040-network-data-stable-full.py +++ b/tests/toranj/test-040-network-data-stable-full.py @@ -134,7 +134,7 @@ c3.join_node(leader, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) c3.set(wpan.WPAN_POLL_INTERVAL, '400') # Clear the "full network data" flag on c3. -c3.set(wpan.WPAN_THREAD_DEVICE_MODE, str(wpan.THREAD_MODE_FLAG_SECURE_DATA_REQUEST)) +c3.set(wpan.WPAN_THREAD_DEVICE_MODE, '-') # ----------------------------------------------------------------------------------------------------------------------- # Test implementation diff --git a/tests/toranj/wpan.py b/tests/toranj/wpan.py index e59a0b709..d72c9ba3d 100644 --- a/tests/toranj/wpan.py +++ b/tests/toranj/wpan.py @@ -259,7 +259,6 @@ ADDRESS_CACHE_ENTRY_STATE_RETRY_QUERY = "retry-query" THREAD_MODE_FLAG_FULL_NETWORK_DATA = (1 << 0) THREAD_MODE_FLAG_FULL_THREAD_DEV = (1 << 1) -THREAD_MODE_FLAG_SECURE_DATA_REQUEST = (1 << 2) THREAD_MODE_FLAG_RX_ON_WHEN_IDLE = (1 << 3) _OT_BUILDDIR = os.getenv('top_builddir', '../..') diff --git a/tools/harness-automation/autothreadharness/harness_case.py b/tools/harness-automation/autothreadharness/harness_case.py index 7daeff01b..06cb1eafb 100644 --- a/tools/harness-automation/autothreadharness/harness_case.py +++ b/tools/harness-automation/autothreadharness/harness_case.py @@ -946,10 +946,10 @@ class HarnessCase(unittest.TestCase): self.dut.mode = 's' self.dut.child_timeout = self.child_timeout elif 'End Device' in body: - self.dut.mode = 'rsn' + self.dut.mode = 'rn' self.dut.child_timeout = self.child_timeout else: - self.dut.mode = 'rsdn' + self.dut.mode = 'rdn' if 'at channel' in body: self.channel = int(body.split(':')[1]) diff --git a/tools/harness-thci/OpenThread.py b/tools/harness-thci/OpenThread.py index a691df9df..82a149f52 100644 --- a/tools/harness-thci/OpenThread.py +++ b/tools/harness-thci/OpenThread.py @@ -1049,7 +1049,7 @@ class OpenThreadTHCI(object): print(eRoleId) self.deviceRole = eRoleId - mode = '' + mode = '-' try: if ModuleHelper.LeaderDutChannelFound: self.channel = ModuleHelper.Default_Channel @@ -1058,36 +1058,36 @@ class OpenThreadTHCI(object): # only sleep end device requires stable networkdata now if eRoleId == Thread_Device_Role.Leader: print('join as leader') - mode = 'rsdn' + mode = 'rdn' if self.AutoDUTEnable is False: # set ROUTER_DOWNGRADE_THRESHOLD self.__setRouterDowngradeThreshold(33) elif eRoleId == Thread_Device_Role.Router: print('join as router') - mode = 'rsdn' + mode = 'rdn' if self.AutoDUTEnable is False: # set ROUTER_DOWNGRADE_THRESHOLD self.__setRouterDowngradeThreshold(33) elif eRoleId == Thread_Device_Role.SED: print('join as sleepy end device') - mode = 's' + mode = '-' self.__setPollPeriod(self.__sedPollPeriod) elif eRoleId == Thread_Device_Role.EndDevice: print('join as end device') - mode = 'rsn' + mode = 'rn' elif eRoleId == Thread_Device_Role.REED: print('join as REED') - mode = 'rsdn' + mode = 'rdn' # set ROUTER_UPGRADE_THRESHOLD self.__setRouterUpgradeThreshold(0) elif eRoleId == Thread_Device_Role.EndDevice_FED: print('join as FED') - mode = 'rsdn' + mode = 'rdn' # always remain an ED, never request to be a router self.__disableRouterEligible() elif eRoleId == Thread_Device_Role.EndDevice_MED: print('join as MED') - mode = 'rsn' + mode = 'rn' else: pass diff --git a/tools/harness-thci/OpenThread_WpanCtl.py b/tools/harness-thci/OpenThread_WpanCtl.py index 23b5d6aa1..bcd1d51d9 100644 --- a/tools/harness-thci/OpenThread_WpanCtl.py +++ b/tools/harness-thci/OpenThread_WpanCtl.py @@ -307,7 +307,7 @@ class OpenThread_WpanCtl(IThci): """set thread device mode: Args: - mode: thread device mode. 15=rsdn, 13=rsn, 4=s + mode: thread device mode. 11=rdn, 9=rn r: rx-on-when-idle s: secure IEEE 802.15.4 data request d: full thread device @@ -1177,14 +1177,14 @@ class OpenThread_WpanCtl(IThci): # only sleep end device requires stable networkdata now if eRoleId == Thread_Device_Role.Leader: print('join as leader') - # rsdn + # rdn mode = 15 if self.AutoDUTEnable is False: # set ROUTER_DOWNGRADE_THRESHOLD self.__setRouterDowngradeThreshold(33) elif eRoleId == Thread_Device_Role.Router: print('join as router') - # rsdn + # rdn mode = 15 if self.AutoDUTEnable is False: # set ROUTER_DOWNGRADE_THRESHOLD @@ -1196,24 +1196,24 @@ class OpenThread_WpanCtl(IThci): self.__setPollPeriod(self.__sedPollPeriod) elif eRoleId == Thread_Device_Role.EndDevice: print('join as end device') - # rsn + # rn mode = 13 elif eRoleId == Thread_Device_Role.REED: print('join as REED') - # rsdn + # rdn mode = 15 # set ROUTER_UPGRADE_THRESHOLD self.__setRouterUpgradeThreshold(0) elif eRoleId == Thread_Device_Role.EndDevice_FED: # always remain an ED, never request to be a router print('join as FED') - # rsdn + # rdn mode = 15 # set ROUTER_UPGRADE_THRESHOLD self.__setRouterUpgradeThreshold(0) elif eRoleId == Thread_Device_Role.EndDevice_MED: print('join as MED') - # rsn + # rn mode = 13 else: pass