espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-05 21:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mac-filter] change whitelist/blacklist to allowlist/denylist (#5507)

Browse Source 
To promote inclusivity and eliminate any unintentional bias.
This commit is contained in:
Jonathan Hui
2020-09-11 16:03:39 -07:00
committed by GitHub
parent 11faac0aad
commit 5bffd8bc4d
162 changed files with 970 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/cc1352/README.md
-1
View File
@@ -94,7 +94,6 @@ scan
start
state
stop
whitelist
```
### NCP example
examples/platforms/cc2538/README.md
-1
View File
@@ -109,5 +109,4 @@ scan
start
state
stop
whitelist
```
examples/platforms/cc2650/README.md
-1
View File
@@ -110,7 +110,6 @@ scan
start
state
stop
whitelist
```
### NCP example
examples/platforms/cc2652/README.md
-1
View File
@@ -94,7 +94,6 @@ scan
start
state
stop
whitelist
```
### NCP example
examples/platforms/efr32mg1/README.md
-1
View File
@@ -146,7 +146,6 @@ In the J-Link Device drop-down list select the serial number of the device to fl
start
state
stop
whitelist
```
3. Start a Thread network as Leader.
examples/platforms/efr32mg12/README.md
-1
View File
@@ -159,7 +159,6 @@ In the J-Link Device drop-down list select the serial number of the device to fl
start
state
stop
whitelist
```
3. Start a Thread network as Leader.
examples/platforms/efr32mg13/README.md
-1
View File
@@ -152,7 +152,6 @@ In the J-Link Device drop-down list select the serial number of the device to fl
start
state
stop
whitelist
```
3. Start a Thread network as Leader.
examples/platforms/efr32mg21/README.md
-1
View File
@@ -125,7 +125,6 @@ scan
start
state
stop
whitelist
```
3. Start a Thread network as Leader.
examples/platforms/gp712/README.md
-1
View File
@@ -68,5 +68,4 @@ scan
start
state
stop
whitelist
```
examples/platforms/samr21/README.md
-1
View File
@@ -111,7 +111,6 @@ $ (gdb) c
start
state
stop
whitelist
```
3. Start a Thread network as Leader.
examples/platforms/simulation/README.md
-1
View File
@@ -68,5 +68,4 @@ scan
start
state
stop
whitelist
```
include/openthread/error.h
+1 -1
View File
@@ -164,7 +164,7 @@ typedef enum OT_MUST_USE_RESULT otError
OT_ERROR_INVALID_SOURCE_ADDRESS = 20,
/**
* Received a frame filtered by the address filter (whitelisted or blacklisted).
* Received a frame filtered by the address filter (allowlisted or denylisted).
*/
OT_ERROR_ADDRESS_FILTERED = 21,
include/openthread/instance.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
* @note This number versions both OpenThread platform and user APIs.
*
*/
#define OPENTHREAD_API_VERSION (27)
#define OPENTHREAD_API_VERSION (28)
/**
* @addtogroup api-instance
include/openthread/link.h
+3 -3
View File
@@ -88,8 +88,8 @@ typedef uint8_t otMacFilterIterator; ///< Used to iterate through mac filter ent
typedef enum otMacFilterAddressMode
{
OT_MAC_FILTER_ADDRESS_MODE_DISABLED, ///< Address filter is disabled.
OT_MAC_FILTER_ADDRESS_MODE_WHITELIST, ///< Whitelist address filter mode is enabled.
OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST, ///< Blacklist address filter mode is enabled.
OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST, ///< Allowlist address filter mode is enabled.
OT_MAC_FILTER_ADDRESS_MODE_DENYLIST, ///< Denylist address filter mode is enabled.
} otMacFilterAddressMode;
/**
@@ -309,7 +309,7 @@ typedef struct otMacCounters
uint32_t mRxOther;
/**
* The total number of frames dropped by MAC Filter module, for example received from blacklisted node.
* The total number of frames dropped by MAC Filter module, for example received from denylisted node.
*
*/
uint32_t mRxAddressFiltered;
src/cli/README.md
+8 -8
View File
@@ -1940,7 +1940,7 @@ List the macfilter status, including address and received signal strength filter
```bash
> macfilter
Address Mode: Whitelist
Address Mode: Allowlist
0f6127e33af6b403 : rss -95 (lqi 1)
0f6127e33af6b402
RssIn List:
@@ -1955,7 +1955,7 @@ List the address filter status.
```bash
> macfilter addr
Whitelist
Allowlist
0f6127e33af6b403 : rss -95 (lqi 1)
0f6127e33af6b402
Done
@@ -1970,21 +1970,21 @@ Disable address filter mode.
Done
```
### macfilter addr whitelist
### macfilter addr allowlist
Enable whitelist address filter mode.
Enable allowlist address filter mode.
```bash
> macfilter addr whitelist
> macfilter addr allowlist
Done
```
### macfilter addr blacklist
### macfilter addr denylist
Enable blacklist address filter mode.
Enable denylist address filter mode.
```bash
> macfilter addr blacklist
> macfilter addr denylist
Done
```
src/cli/cli.cpp
+12 -12
View File
@@ -4082,13 +4082,13 @@ void Interpreter::PrintMacFilter(void)
{
OutputFormat("Address Mode: Disabled\r\n");
}
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_WHITELIST)
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST)
{
OutputFormat("Address Mode: Whitelist\r\n");
OutputFormat("Address Mode: Allowlist\r\n");
}
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST)
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_DENYLIST)
{
OutputFormat("Address Mode: Blacklist\r\n");
OutputFormat("Address Mode: Denylist\r\n");
}
while (otLinkFilterGetNextAddress(mInstance, &iterator, &entry) == OT_ERROR_NONE)
@@ -4147,13 +4147,13 @@ otError Interpreter::ProcessMacFilterAddress(uint8_t aArgsLength, char *aArgs[])
{
OutputFormat("Disabled\r\n");
}
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_WHITELIST)
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST)
{
OutputFormat("Whitelist\r\n");
OutputFormat("Allowlist\r\n");
}
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST)
else if (mode == OT_MAC_FILTER_ADDRESS_MODE_DENYLIST)
{
OutputFormat("Blacklist\r\n");
OutputFormat("Denylist\r\n");
}
while (otLinkFilterGetNextAddress(mInstance, &iterator, &entry) == OT_ERROR_NONE)
@@ -4176,15 +4176,15 @@ otError Interpreter::ProcessMacFilterAddress(uint8_t aArgsLength, char *aArgs[])
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
otLinkFilterSetAddressMode(mInstance, OT_MAC_FILTER_ADDRESS_MODE_DISABLED);
}
else if (strcmp(aArgs[0], "whitelist") == 0)
else if (strcmp(aArgs[0], "allowlist") == 0)
{
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
otLinkFilterSetAddressMode(mInstance, OT_MAC_FILTER_ADDRESS_MODE_WHITELIST);
otLinkFilterSetAddressMode(mInstance, OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST);
}
else if (strcmp(aArgs[0], "blacklist") == 0)
else if (strcmp(aArgs[0], "denylist") == 0)
{
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
otLinkFilterSetAddressMode(mInstance, OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST);
otLinkFilterSetAddressMode(mInstance, OT_MAC_FILTER_ADDRESS_MODE_DENYLIST);
}
else if (strcmp(aArgs[0], "add") == 0)
{
src/core/mac/mac_filter.cpp
+4 -4
View File
@@ -220,8 +220,8 @@ otError Filter::Apply(const ExtAddress &aExtAddress, int8_t &aRss)
// Use the default RssIn setting for all receiving messages first.
aRss = mDefaultRssIn;
// In whitelist mode, entry must be present in the list, in
// blacklist mode it must not be present.
// In allowlist mode, entry must be present in the list, in
// denylist mode it must not be present.
isInFilterList = (entry != nullptr) && entry->mFiltered;
@@ -230,11 +230,11 @@ otError Filter::Apply(const ExtAddress &aExtAddress, int8_t &aRss)
case kModeRssInOnly:
break;
case kModeWhitelist:
case kModeAllowlist:
VerifyOrExit(isInFilterList, error = OT_ERROR_ADDRESS_FILTERED);
break;
case kModeBlacklist:
case kModeDenylist:
VerifyOrExit(!isInFilterList, error = OT_ERROR_ADDRESS_FILTERED);
break;
}
src/core/mac/mac_filter.hpp
+4 -4
View File
@@ -80,8 +80,8 @@ public:
enum Mode : uint8_t
{
kModeRssInOnly = OT_MAC_FILTER_ADDRESS_MODE_DISABLED, ///< No address filtering. RSS-In update only.
kModeWhitelist = OT_MAC_FILTER_ADDRESS_MODE_WHITELIST, ///< Enable whitelist address filter mode.
kModeBlacklist = OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST, ///< Enable blacklist address filter mode.
kModeAllowlist = OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST, ///< Enable allowlist address filter mode.
kModeDenylist = OT_MAC_FILTER_ADDRESS_MODE_DENYLIST, ///< Enable denylist address filter mode.
};
enum : int8_t
@@ -218,7 +218,7 @@ public:
* @param[out] aRss A reference to where the received signal strength to be placed.
*
* @retval OT_ERROR_NONE Successfully applied the filter rules on @p aExtAddress.
* @retval OT_ERROR_ADDRESS_FILTERED Address filter (whitelist or blacklist) is enabled and @p aExtAddress is
* @retval OT_ERROR_ADDRESS_FILTERED Address filter (allowlist or denylist) is enabled and @p aExtAddress is
* filtered.
*
*/
@@ -232,7 +232,7 @@ private:
struct FilterEntry
{
bool mFiltered; // Indicates whether or not this entry is filtered (whitelist/blacklist modes).
bool mFiltered; // Indicates whether or not this entry is filtered (allowlist/denylist modes).
int8_t mRssIn; // The RssIn value for this entry or `kFixedRssDisabled`.
ExtAddress mExtAddress; // IEEE 802.15.4 Extended Address.
src/lib/spinel/spinel.c
+10 -10
View File
@@ -1495,12 +1495,12 @@ const char *spinel_prop_key_to_cstr(spinel_prop_key_t prop_key)
ret = "MAC_DATA_POLL_PERIOD";
break;
case SPINEL_PROP_MAC_WHITELIST:
ret = "MAC_WHITELIST";
case SPINEL_PROP_MAC_ALLOWLIST:
ret = "MAC_ALLOWLIST";
break;
case SPINEL_PROP_MAC_WHITELIST_ENABLED:
ret = "MAC_WHITELIST_ENABLED";
case SPINEL_PROP_MAC_ALLOWLIST_ENABLED:
ret = "MAC_ALLOWLIST_ENABLED";
break;
case SPINEL_PROP_MAC_EXTENDED_ADDR:
@@ -1519,12 +1519,12 @@ const char *spinel_prop_key_to_cstr(spinel_prop_key_t prop_key)
ret = "MAC_SRC_MATCH_EXTENDED_ADDRESSES";
break;
case SPINEL_PROP_MAC_BLACKLIST:
ret = "MAC_BLACKLIST";
case SPINEL_PROP_MAC_DENYLIST:
ret = "MAC_DENYLIST";
break;
case SPINEL_PROP_MAC_BLACKLIST_ENABLED:
ret = "MAC_BLACKLIST_ENABLED";
case SPINEL_PROP_MAC_DENYLIST_ENABLED:
ret = "MAC_DENYLIST_ENABLED";
break;
case SPINEL_PROP_MAC_FIXED_RSS:
@@ -2603,8 +2603,8 @@ const char *spinel_capability_to_cstr(spinel_capability_t capability)
ret = "NET_THREAD_1_1";
break;
case SPINEL_CAP_MAC_WHITELIST:
ret = "MAC_WHITELIST";
case SPINEL_CAP_MAC_ALLOWLIST:
ret = "MAC_ALLOWLIST";
break;
case SPINEL_CAP_MAC_RAW:
src/lib/spinel/spinel.h
+16 -16
View File
@@ -1080,7 +1080,7 @@ enum
SPINEL_CAP_NET__END = 64,
SPINEL_CAP_OPENTHREAD__BEGIN = 512,
SPINEL_CAP_MAC_WHITELIST = (SPINEL_CAP_OPENTHREAD__BEGIN + 0),
SPINEL_CAP_MAC_ALLOWLIST = (SPINEL_CAP_OPENTHREAD__BEGIN + 0),
SPINEL_CAP_MAC_RAW = (SPINEL_CAP_OPENTHREAD__BEGIN + 1),
SPINEL_CAP_OOB_STEERING_DATA = (SPINEL_CAP_OPENTHREAD__BEGIN + 2),
SPINEL_CAP_CHANNEL_MONITOR = (SPINEL_CAP_OPENTHREAD__BEGIN + 3),
@@ -1875,9 +1875,9 @@ enum
SPINEL_PROP_MAC_EXT__BEGIN = 0x1300,
/// MAC Whitelist
/// MAC Allowlist
/** Format: `A(t(Ec))`
* Required capability: `CAP_MAC_WHITELIST`
* Required capability: `CAP_MAC_ALLOWLIST`
*
* Structure Parameters:
*
@@ -1888,14 +1888,14 @@ enum
* inserting, it is assumed to be 127. This parameter is
* ignored when removing.
*/
SPINEL_PROP_MAC_WHITELIST = SPINEL_PROP_MAC_EXT__BEGIN + 0,
SPINEL_PROP_MAC_ALLOWLIST = SPINEL_PROP_MAC_EXT__BEGIN + 0,
/// MAC Whitelist Enabled Flag
/// MAC Allowlist Enabled Flag
/** Format: `b`
* Required capability: `CAP_MAC_WHITELIST`
* Required capability: `CAP_MAC_ALLOWLIST`
*
*/
SPINEL_PROP_MAC_WHITELIST_ENABLED = SPINEL_PROP_MAC_EXT__BEGIN + 1,
SPINEL_PROP_MAC_ALLOWLIST_ENABLED = SPINEL_PROP_MAC_EXT__BEGIN + 1,
/// MAC Extended Address
/** Format: `E`
@@ -1930,26 +1930,26 @@ enum
*/
SPINEL_PROP_MAC_SRC_MATCH_EXTENDED_ADDRESSES = SPINEL_PROP_MAC_EXT__BEGIN + 5,
/// MAC Blacklist
/// MAC Denylist
/** Format: `A(t(E))`
* Required capability: `CAP_MAC_WHITELIST`
* Required capability: `CAP_MAC_ALLOWLIST`
*
* Structure Parameters:
*
* `E`: EUI64 address of node
*
*/
SPINEL_PROP_MAC_BLACKLIST = SPINEL_PROP_MAC_EXT__BEGIN + 6,
SPINEL_PROP_MAC_DENYLIST = SPINEL_PROP_MAC_EXT__BEGIN + 6,
/// MAC Blacklist Enabled Flag
/// MAC Denylist Enabled Flag
/** Format: `b`
* Required capability: `CAP_MAC_WHITELIST`
* Required capability: `CAP_MAC_ALLOWLIST`
*/
SPINEL_PROP_MAC_BLACKLIST_ENABLED = SPINEL_PROP_MAC_EXT__BEGIN + 7,
SPINEL_PROP_MAC_DENYLIST_ENABLED = SPINEL_PROP_MAC_EXT__BEGIN + 7,
/// MAC Received Signal Strength Filter
/** Format: `A(t(Ec))`
* Required capability: `CAP_MAC_WHITELIST`
* Required capability: `CAP_MAC_ALLOWLIST`
*
* Structure Parameters:
*
@@ -3729,7 +3729,7 @@ enum
/** Format: `L` (Read-only) */
SPINEL_PROP_CNTR_RX_PKT_OTHER = SPINEL_PROP_CNTR__BEGIN + 105,
/// The number of received packets filtered by whitelist.
/// The number of received packets filtered by allowlist.
/** Format: `L` (Read-only) */
SPINEL_PROP_CNTR_RX_PKT_FILT_WL = SPINEL_PROP_CNTR__BEGIN + 106,
@@ -3888,7 +3888,7 @@ enum
* 'L': RxBeaconRequest (The number of received beacon request).
* 'L': RxOther (The number of received other types of frames).
* 'L': RxAddressFiltered (The number of received packets filtered by address filter
* (whitelist or blacklist)).
* (allowlist or denylist)).
* 'L': RxDestAddrFiltered (The number of received packets filtered by destination check).
* 'L': RxDuplicated (The number of received duplicated packets).
* 'L': RxErrNoFrame (The number of received packets with no or malformed content).
src/ncp/ncp_base.cpp
+1 -1
View File
@@ -1812,7 +1812,7 @@ template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_CAPS>(void)
SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_PCAP));
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_MAC_WHITELIST));
SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_MAC_ALLOWLIST));
#endif
#if OPENTHREAD_CONFIG_JAM_DETECTION_ENABLE
src/ncp/ncp_base_dispatcher.cpp
+12 -12
View File
@@ -231,8 +231,8 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey)
#endif
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST_ENABLED),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST_ENABLED),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_EXTENDED_ADDR),
#endif
#endif // OPENTHREAD_MTD || OPENTHREAD_FTD
@@ -241,8 +241,8 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey)
#endif
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST_ENABLED),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST_ENABLED),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_FIXED_RSS),
#endif
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_MAC_CCA_FAILURE_RATE),
@@ -442,8 +442,8 @@ NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey)
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST_ENABLED),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST_ENABLED),
#endif
#endif // OPENTHREAD_MTD || OPENTHREAD_FTD
@@ -455,8 +455,8 @@ NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey)
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST_ENABLED),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST_ENABLED),
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_FIXED_RSS),
#endif
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MAC_MAX_RETRY_NUMBER_DIRECT),
@@ -568,14 +568,14 @@ NcpBase::PropertyHandler NcpBase::FindInsertPropertyHandler(spinel_prop_key_t aK
#endif // #if OPENTHREAD_MTD || OPENTHREAD_FTD
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_UNSOL_UPDATE_FILTER),
#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST),
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST),
#endif
#if OPENTHREAD_RADIO || OPENTHREAD_CONFIG_LINK_RAW_ENABLE
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_SRC_MATCH_SHORT_ADDRESSES),
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_SRC_MATCH_EXTENDED_ADDRESSES),
#endif
#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST),
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST),
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_MAC_FIXED_RSS),
#endif
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
@@ -616,14 +616,14 @@ NcpBase::PropertyHandler NcpBase::FindRemovePropertyHandler(spinel_prop_key_t aK
#endif // #if OPENTHREAD_MTD || OPENTHREAD_FTD
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_UNSOL_UPDATE_FILTER),
#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_WHITELIST),
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_ALLOWLIST),
#endif
#if OPENTHREAD_RADIO || OPENTHREAD_CONFIG_LINK_RAW_ENABLE
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_SRC_MATCH_SHORT_ADDRESSES),
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_SRC_MATCH_EXTENDED_ADDRESSES),
#endif
#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_BLACKLIST),
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_DENYLIST),
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_MAC_FIXED_RSS),
#endif
#if OPENTHREAD_FTD
src/ncp/ncp_base_mtd.cpp
+20 -20
View File
@@ -2599,7 +2599,7 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_CNTR_ALL_IP_COUNTERS>
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_WHITELIST>(void)
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_ALLOWLIST>(void)
{
otMacFilterEntry entry;
otMacFilterIterator iterator = OT_MAC_FILTER_ITERATOR_INIT;
@@ -2619,12 +2619,12 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_WHITELIST_ENABLED>(void)
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_ALLOWLIST_ENABLED>(void)
{
return mEncoder.WriteBool(otLinkFilterGetAddressMode(mInstance) == OT_MAC_FILTER_ADDRESS_MODE_WHITELIST);
return mEncoder.WriteBool(otLinkFilterGetAddressMode(mInstance) == OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST);
}
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_BLACKLIST>(void)
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_DENYLIST>(void)
{
otMacFilterEntry entry;
otMacFilterIterator iterator = OT_MAC_FILTER_ITERATOR_INIT;
@@ -2641,9 +2641,9 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_BLACKLIST_ENABLED>(void)
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_DENYLIST_ENABLED>(void)
{
return mEncoder.WriteBool(otLinkFilterGetAddressMode(mInstance) == OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST);
return mEncoder.WriteBool(otLinkFilterGetAddressMode(mInstance) == OT_MAC_FILTER_ADDRESS_MODE_DENYLIST);
}
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MAC_FIXED_RSS>(void)
@@ -2666,7 +2666,7 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_WHITELIST>(void)
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_ALLOWLIST>(void)
{
otError error = OT_ERROR_NONE;
@@ -2709,19 +2709,19 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_WHITELIST>(void)
exit:
// If we had an error, we may have actually changed
// the state of the whitelist, so we need to report
// the state of the allowlist, so we need to report
// those incomplete changes via an asynchronous
// change event.
if (error != OT_ERROR_NONE)
{
IgnoreError(WritePropertyValueIsFrame(SPINEL_HEADER_FLAG | SPINEL_HEADER_IID_0, SPINEL_PROP_MAC_WHITELIST));
IgnoreError(WritePropertyValueIsFrame(SPINEL_HEADER_FLAG | SPINEL_HEADER_IID_0, SPINEL_PROP_MAC_ALLOWLIST));
}
return error;
}
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_WHITELIST_ENABLED>(void)
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_ALLOWLIST_ENABLED>(void)
{
bool enabled;
otError error = OT_ERROR_NONE;
@@ -2731,7 +2731,7 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_WHITELIST_ENABLED
if (enabled)
{
mode = OT_MAC_FILTER_ADDRESS_MODE_WHITELIST;
mode = OT_MAC_FILTER_ADDRESS_MODE_ALLOWLIST;
}
otLinkFilterSetAddressMode(mInstance, mode);
@@ -2740,7 +2740,7 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_BLACKLIST>(void)
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_DENYLIST>(void)
{
otError error = OT_ERROR_NONE;
@@ -2760,19 +2760,19 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_BLACKLIST>(void)
exit:
// If we had an error, we may have actually changed
// the state of the blacklist, so we need to report
// the state of the denylist, so we need to report
// those incomplete changes via an asynchronous
// change event.
if (error != OT_ERROR_NONE)
{
IgnoreError(WritePropertyValueIsFrame(SPINEL_HEADER_FLAG | SPINEL_HEADER_IID_0, SPINEL_PROP_MAC_BLACKLIST));
IgnoreError(WritePropertyValueIsFrame(SPINEL_HEADER_FLAG | SPINEL_HEADER_IID_0, SPINEL_PROP_MAC_DENYLIST));
}
return error;
}
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_BLACKLIST_ENABLED>(void)
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_DENYLIST_ENABLED>(void)
{
bool enabled;
otError error = OT_ERROR_NONE;
@@ -2782,7 +2782,7 @@ template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_MAC_BLACKLIST_ENABLED
if (enabled)
{
mode = OT_MAC_FILTER_ADDRESS_MODE_BLACKLIST;
mode = OT_MAC_FILTER_ADDRESS_MODE_DENYLIST;
}
otLinkFilterSetAddressMode(mInstance, mode);
@@ -2974,7 +2974,7 @@ exit:
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
template <> otError NcpBase::HandlePropertyInsert<SPINEL_PROP_MAC_WHITELIST>(void)
template <> otError NcpBase::HandlePropertyInsert<SPINEL_PROP_MAC_ALLOWLIST>(void)
{
otError error = OT_ERROR_NONE;
const otExtAddress *extAddress;
@@ -3005,7 +3005,7 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertyInsert<SPINEL_PROP_MAC_BLACKLIST>(void)
template <> otError NcpBase::HandlePropertyInsert<SPINEL_PROP_MAC_DENYLIST>(void)
{
otError error = OT_ERROR_NONE;
const otExtAddress *extAddress;
@@ -3072,7 +3072,7 @@ exit:
#if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE
template <> otError NcpBase::HandlePropertyRemove<SPINEL_PROP_MAC_WHITELIST>(void)
template <> otError NcpBase::HandlePropertyRemove<SPINEL_PROP_MAC_ALLOWLIST>(void)
{
otError error = OT_ERROR_NONE;
const otExtAddress *extAddress = nullptr;
@@ -3085,7 +3085,7 @@ exit:
return error;
}
template <> otError NcpBase::HandlePropertyRemove<SPINEL_PROP_MAC_BLACKLIST>(void)
template <> otError NcpBase::HandlePropertyRemove<SPINEL_PROP_MAC_DENYLIST>(void)
{
otError error = OT_ERROR_NONE;
const otExtAddress *extAddress = nullptr;
src/posix/platform/README.md
+1 -1
View File
@@ -54,5 +54,5 @@ scan
start
state
stop
whitelist
allowlist
```
tests/scripts/expect/cli-macfilter.exp
+6 -6
View File
@@ -44,16 +44,16 @@ expect "Disabled"
expect "aabbccddeeff0011"
expect "Done"
send "macfilter addr whitelist\n"
send "macfilter addr allowlist\n"
expect "Done"
send "macfilter addr\n"
expect "Whitelist"
expect "Allowlist"
expect "aabbccddeeff0011"
expect "Done"
send "macfilter\n"
expect "Address Mode: Whitelist"
expect "Address Mode: Allowlist"
expect "aabbccddeeff0011"
expect "RssIn List:"
expect "Done"
@@ -64,16 +64,16 @@ expect "Done"
send "macfilter addr remove aabbccddeeff0011\n"
expect "Done"
send "macfilter addr blacklist\n"
send "macfilter addr denylist\n"
expect "Done"
send "macfilter addr\n"
expect "Blacklist"
expect "Denylist"
expect "2233445566778899"
expect "Done"
send "macfilter\n"
expect "Address Mode: Blacklist"
expect "Address Mode: Denylist"
expect "2233445566778899"
expect "RssIn List:"
expect "Done"
tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py
+2 -2
View File
@@ -42,13 +42,13 @@ class Cert_5_1_01_RouterAttach(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py
+4 -4
View File
@@ -46,27 +46,27 @@ class Cert_5_1_02_ChildAddressTimeout(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED, SED]
'allowlist': [LEADER, ED, SED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED: {
'is_mtd': True,
'mode': 'sn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py
+3 -3
View File
@@ -43,19 +43,19 @@ class Cert_5_1_03_RouterAddressReallocation(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER2]
'allowlist': [LEADER, ROUTER2]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1]
'allowlist': [LEADER, ROUTER1]
},
}
tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py
+3 -3
View File
@@ -43,19 +43,19 @@ class Cert_5_1_04_RouterAddressReallocation(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER2]
'allowlist': [LEADER, ROUTER2]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1]
'allowlist': [LEADER, ROUTER1]
},
}
tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py
+4 -4
View File
@@ -42,19 +42,19 @@ class Cert_5_1_05_RouterAddressTimeout(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
def _setUpRouter1(self):
self.nodes[ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER1].enable_whitelist()
self.nodes[ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER1].enable_allowlist()
self.nodes[ROUTER1].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py
+2 -2
View File
@@ -43,13 +43,13 @@ class Cert_5_1_06_RemoveRouterId(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py
+12 -12
View File
@@ -45,7 +45,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
@@ -53,7 +53,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, 3, 4, 5, 6, SED1, 8, 9, 10, 11, 12]
'allowlist': [LEADER, 3, 4, 5, 6, SED1, 8, 9, 10, 11, 12]
},
3: {
'name': 'MED1',
@@ -61,7 +61,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
4: {
'name': 'MED2',
@@ -69,7 +69,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
5: {
'name': 'MED3',
@@ -77,7 +77,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
6: {
'name': 'MED4',
@@ -85,7 +85,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED1: {
'name': 'SED1',
@@ -93,7 +93,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
8: {
'name': 'SED2',
@@ -101,7 +101,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
9: {
'name': 'SED3',
@@ -109,7 +109,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
10: {
'name': 'SED4',
@@ -117,7 +117,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
11: {
'name': 'SED5',
@@ -125,7 +125,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
12: {
'name': 'SED6',
@@ -133,7 +133,7 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py
+5 -5
View File
@@ -45,31 +45,31 @@ class Cert_5_1_08_RouterAttachConnectivity(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2, ROUTER3]
'allowlist': [ROUTER1, ROUTER2, ROUTER3]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER3]
'allowlist': [LEADER, ROUTER3]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER4]
'allowlist': [LEADER, ROUTER4]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1, ROUTER4]
'allowlist': [LEADER, ROUTER1, ROUTER4]
},
ROUTER4: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER2, ROUTER3]
'allowlist': [ROUTER2, ROUTER3]
},
}
tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py
+5 -5
View File
@@ -45,31 +45,31 @@ class Cert_5_1_09_REEDAttachConnectivity(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, REED0, REED1]
'allowlist': [ROUTER1, REED0, REED1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, REED1]
'allowlist': [LEADER, REED1]
},
REED0: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, ROUTER2]
'allowlist': [LEADER, ROUTER2]
},
REED1: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, ROUTER1, ROUTER2]
'allowlist': [LEADER, ROUTER1, ROUTER2]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [REED0, REED1]
'allowlist': [REED0, REED1]
},
}
tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py
+4 -4
View File
@@ -43,25 +43,25 @@ class Cert_5_1_10_RouterAttachLinkQuality(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER3]
'allowlist': [LEADER, ROUTER3]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, (ROUTER3, -85)]
'allowlist': [LEADER, (ROUTER3, -85)]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py
+4 -4
View File
@@ -43,25 +43,25 @@ class Cert_5_1_11_REEDAttachLinkQuality(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, ROUTER1]
'allowlist': [LEADER, ROUTER1]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, (ROUTER1, -85)]
'allowlist': [LEADER, (ROUTER1, -85)]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py
+5 -5
View File
@@ -42,19 +42,19 @@ class Cert_5_1_12_NewRouterSync(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
@@ -122,8 +122,8 @@ class Cert_5_1_12_NewRouterSync(thread_cert.TestCase):
msg.assertMleMessageContainsTlv(mle.LeaderData)
msg.assertMleMessageContainsTlv(mle.Route64)
self.nodes[ROUTER1].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[ROUTER2].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER1].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[ROUTER2].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.simulator.go(35)
tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py
+4 -4
View File
@@ -41,19 +41,19 @@ class Cert_5_1_13_RouterReset(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
def _setUpRouter(self):
self.nodes[ROUTER].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER].enable_whitelist()
self.nodes[ROUTER].add_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER].enable_allowlist()
self.nodes[ROUTER].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py
+4 -4
View File
@@ -45,26 +45,26 @@ class Cert_5_2_01_REEDAttach(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
DUT_ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, REED1]
'allowlist': [LEADER, REED1]
},
REED1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'router_upgrade_threshold': 1,
'whitelist': [DUT_ROUTER1, MED1]
'allowlist': [DUT_ROUTER1, MED1]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [REED1]
'allowlist': [REED1]
},
}
tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py
+33 -33
View File
@@ -50,7 +50,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
33,
'router_upgrade_threshold':
32,
'whitelist': [
'allowlist': [
ROUTER_1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, ROUTER_31
]
@@ -61,7 +61,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER, ROUTER_32]
'allowlist': [DUT_LEADER, ROUTER_32]
},
3: {
'mode': 'rsdn',
@@ -69,7 +69,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
4: {
'mode': 'rsdn',
@@ -77,7 +77,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
5: {
'mode': 'rsdn',
@@ -85,7 +85,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
6: {
'mode': 'rsdn',
@@ -93,7 +93,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
7: {
'mode': 'rsdn',
@@ -101,7 +101,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
8: {
'mode': 'rsdn',
@@ -109,7 +109,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
9: {
'mode': 'rsdn',
@@ -117,7 +117,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
10: {
'mode': 'rsdn',
@@ -125,7 +125,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
11: {
'mode': 'rsdn',
@@ -133,7 +133,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
12: {
'mode': 'rsdn',
@@ -141,7 +141,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
13: {
'mode': 'rsdn',
@@ -149,7 +149,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
14: {
'mode': 'rsdn',
@@ -157,7 +157,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
15: {
'mode': 'rsdn',
@@ -165,7 +165,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
16: {
'mode': 'rsdn',
@@ -173,7 +173,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
17: {
'mode': 'rsdn',
@@ -181,7 +181,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
18: {
'mode': 'rsdn',
@@ -189,7 +189,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
19: {
'mode': 'rsdn',
@@ -197,7 +197,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
20: {
'mode': 'rsdn',
@@ -205,7 +205,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
21: {
'mode': 'rsdn',
@@ -213,7 +213,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
22: {
'mode': 'rsdn',
@@ -221,7 +221,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
23: {
'mode': 'rsdn',
@@ -229,7 +229,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
24: {
'mode': 'rsdn',
@@ -237,7 +237,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
25: {
'mode': 'rsdn',
@@ -245,7 +245,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
26: {
'mode': 'rsdn',
@@ -253,7 +253,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
27: {
'mode': 'rsdn',
@@ -261,7 +261,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
28: {
'mode': 'rsdn',
@@ -269,7 +269,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
29: {
'mode': 'rsdn',
@@ -277,7 +277,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
30: {
'mode': 'rsdn',
@@ -285,7 +285,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
31: {
'mode': 'rsdn',
@@ -293,7 +293,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
ROUTER_31: {
'mode': 'rsdn',
@@ -301,7 +301,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
ROUTER_32: {
'mode': 'rsdn',
@@ -309,7 +309,7 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase):
'router_downgrade_threshold': 33,
'router_selection_jitter': 1,
'router_upgrade_threshold': 33,
'whitelist': [ROUTER_1]
'allowlist': [ROUTER_1]
},
}
tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py
+18 -18
View File
@@ -49,108 +49,108 @@ class Cert_5_2_4_REEDUpgrade(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER]
'allowlist': [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER]
},
2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
4: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
5: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
6: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
7: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
8: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
9: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
10: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
11: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
12: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
13: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
14: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_REED]
'allowlist': [LEADER, DUT_REED]
},
DUT_REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER, ED]
'allowlist': [ROUTER, ED]
},
ED: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_REED]
'allowlist': [DUT_REED]
},
}
tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py
+20 -20
View File
@@ -46,109 +46,109 @@ class Cert_5_2_5_AddressQuery(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, BR, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ED1]
'allowlist': [ROUTER1, BR, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ED1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_REED]
'allowlist': [LEADER, DUT_REED]
},
BR: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
4: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
5: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
6: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
7: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
8: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
9: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
10: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
11: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
12: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
13: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
14: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
16: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
DUT_REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
@@ -193,8 +193,8 @@ class Cert_5_2_5_AddressQuery(thread_cert.TestCase):
assert msg is True, "Error: The REED sent an Address Solicit Request"
# 5. Enable a link between the DUT and BR to create a one-way link.
self.nodes[DUT_REED].add_whitelist(self.nodes[BR].get_addr64())
self.nodes[BR].add_whitelist(self.nodes[DUT_REED].get_addr64())
self.nodes[DUT_REED].add_allowlist(self.nodes[BR].get_addr64())
self.nodes[BR].add_allowlist(self.nodes[DUT_REED].get_addr64())
# 6. Verify DUT_REED would send Address Notification when ping to its
# ML-EID.
tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py
+1 -1
View File
@@ -146,7 +146,7 @@ class Cert_5_2_7_REEDSynchronization(thread_cert.TestCase):
# 2. DUT_REED: Attach to network. Verify it didn't send an Address Solicit Request.
# Avoid DUT_REED attach to DUT_ROUTER1.
self.nodes[DUT_REED].add_whitelist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.nodes[DUT_REED].add_allowlist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.nodes[DUT_REED].start()
self.simulator.go(config.MAX_ADVERTISEMENT_INTERVAL)
tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py
+4 -4
View File
@@ -43,26 +43,26 @@ class Cert_5_3_2_RealmLocal(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_ROUTER2]
'allowlist': [LEADER, DUT_ROUTER2]
},
DUT_ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1, SED1]
'allowlist': [ROUTER1, SED1]
},
SED1: {
'is_mtd': True,
'mode': 'sn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [DUT_ROUTER2]
'allowlist': [DUT_ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py
+5 -5
View File
@@ -46,32 +46,32 @@ class Cert_5_3_3_AddressQuery(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, DUT_ROUTER2, ROUTER3]
'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
DUT_ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER3, MED1]
'allowlist': [LEADER, ROUTER3, MED1]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_ROUTER2]
'allowlist': [LEADER, DUT_ROUTER2]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'timeout': 3,
'whitelist': [DUT_ROUTER2]
'allowlist': [DUT_ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py
+7 -7
View File
@@ -49,44 +49,44 @@ class Cert_5_3_4_AddressMapCache(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1, ED1, ED2, ED3, ED4]
'allowlist': [DUT_ROUTER1, ED1, ED2, ED3, ED4]
},
DUT_ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, SED1]
'allowlist': [LEADER, SED1]
},
SED1: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': 5,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
ED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED2: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED3: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED4: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py
+10 -10
View File
@@ -44,25 +44,25 @@ class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1, ROUTER2]
'allowlist': [DUT_ROUTER1, ROUTER2]
},
DUT_ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER2, ROUTER3]
'allowlist': [LEADER, ROUTER2, ROUTER3]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_ROUTER1]
'allowlist': [LEADER, DUT_ROUTER1]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
}
@@ -88,8 +88,8 @@ class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase):
command.check_icmp_path(self.simulator, path, self.nodes)
# 4 & 5
self.nodes[LEADER].add_whitelist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.nodes[DUT_ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.nodes[LEADER].add_allowlist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.nodes[DUT_ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_1'])
self.simulator.go(3 * config.MAX_ADVERTISEMENT_INTERVAL)
# Verify the ICMPv6 Echo Request took the longer path because it cost
@@ -99,8 +99,8 @@ class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase):
command.check_icmp_path(self.simulator, path, self.nodes)
# 6 & 7
self.nodes[LEADER].add_whitelist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_2'])
self.nodes[DUT_ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_2'])
self.nodes[LEADER].add_allowlist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_2'])
self.nodes[DUT_ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_2'])
self.simulator.go(3 * config.MAX_ADVERTISEMENT_INTERVAL)
# Verify the direct neighbor would be prioritized when there are two
@@ -110,8 +110,8 @@ class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase):
command.check_icmp_path(self.simulator, path, self.nodes)
# 8 & 9
self.nodes[LEADER].add_whitelist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_0'])
self.nodes[DUT_ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_0'])
self.nodes[LEADER].add_allowlist(self.nodes[DUT_ROUTER1].get_addr64(), config.RSSI['LINK_QULITY_0'])
self.nodes[DUT_ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64(), config.RSSI['LINK_QULITY_0'])
self.simulator.go(3 * config.MAX_ADVERTISEMENT_INTERVAL)
# Verify the ICMPv6 Echo Request took the longer path.
tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py
+5 -5
View File
@@ -44,25 +44,25 @@ class Cert_5_3_6_RouterIdMask(thread_cert.TestCase):
DUT_LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_LEADER, ROUTER2]
'allowlist': [DUT_LEADER, ROUTER2]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
def _setUpRouter2(self):
self.nodes[ROUTER2].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER2].enable_whitelist()
self.nodes[ROUTER2].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER2].enable_allowlist()
self.nodes[ROUTER2].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py
+3 -3
View File
@@ -41,19 +41,19 @@ class Cert_5_3_6_RouterIdMask(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER2]
'allowlist': [LEADER, ROUTER2]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py
+6 -6
View File
@@ -49,37 +49,37 @@ class Cert_5_3_7_DuplicateAddress(thread_cert.TestCase):
DUT_LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2, MED3]
'allowlist': [ROUTER1, ROUTER2, MED3]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_LEADER, MED1]
'allowlist': [DUT_LEADER, MED1]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_LEADER, SED1]
'allowlist': [DUT_LEADER, SED1]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
SED1: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'whitelist': [ROUTER2]
'allowlist': [ROUTER2]
},
MED3: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
}
tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py
+4 -4
View File
@@ -48,25 +48,25 @@ class Cert_5_3_8_ChildAddressSet(thread_cert.TestCase):
DUT_LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [BR, MED1, MED2]
'allowlist': [BR, MED1, MED2]
},
BR: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
MED2: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
}
tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py
+5 -5
View File
@@ -47,32 +47,32 @@ class Cert_5_3_09_AddressQuery(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, DUT_ROUTER2, ROUTER3]
'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
DUT_ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, SED1]
'allowlist': [LEADER, SED1]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [DUT_ROUTER2]
'allowlist': [DUT_ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py
+5 -5
View File
@@ -49,31 +49,31 @@ class Cert_5_3_10_AddressQuery(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [BR, ROUTER1, DUT_ROUTER2]
'allowlist': [BR, ROUTER1, DUT_ROUTER2]
},
BR: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, DUT_ROUTER2]
'allowlist': [LEADER, DUT_ROUTER2]
},
DUT_ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1, MED1]
'allowlist': [LEADER, ROUTER1, MED1]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [DUT_ROUTER2]
'allowlist': [DUT_ROUTER2]
},
}
tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py
+3 -3
View File
@@ -43,19 +43,19 @@ class Cert_5_3_11_AddressQueryTimeoutIntervals(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
DUT_ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, MED1]
'allowlist': [LEADER, MED1]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
}
tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py
+4 -4
View File
@@ -44,19 +44,19 @@ class Cert_5_5_1_LeaderReboot(thread_cert.TestCase):
DUT_LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [DUT_ROUTER1]
'allowlist': [DUT_ROUTER1]
},
DUT_ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [DUT_LEADER]
'allowlist': [DUT_LEADER]
},
}
def _setUpLeader(self):
self.nodes[DUT_LEADER].add_whitelist(self.nodes[DUT_ROUTER1].get_addr64())
self.nodes[DUT_LEADER].enable_whitelist()
self.nodes[DUT_LEADER].add_allowlist(self.nodes[DUT_ROUTER1].get_addr64())
self.nodes[DUT_LEADER].enable_allowlist()
def test(self):
# 1 ALL: Build and verify the topology
tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py
+5 -5
View File
@@ -47,27 +47,27 @@ class Cert_5_5_2_LeaderReboot(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ED: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
def _setUpLeader(self):
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER].get_addr64())
self.nodes[LEADER].enable_allowlist()
self.nodes[LEADER].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py
+12 -12
View File
@@ -47,45 +47,45 @@ class Cert_5_5_3_SplitMergeChildren(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1, ROUTER2, ED1]
'allowlist': [ROUTER1, ROUTER2, ED1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED2, ED3]
'allowlist': [LEADER, ED2, ED3]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED2: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ED3: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
def _setUpLeader(self):
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER].add_whitelist(self.nodes[ED1].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ED1].get_addr64())
self.nodes[LEADER].enable_allowlist()
self.nodes[LEADER].set_router_selection_jitter(1)
def test(self):
@@ -116,8 +116,8 @@ class Cert_5_5_3_SplitMergeChildren(thread_cert.TestCase):
self.nodes[LEADER].reset()
self._setUpLeader()
self.nodes[ED1].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER1].add_whitelist(self.nodes[ED1].get_addr64())
self.nodes[ED1].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER1].add_allowlist(self.nodes[ED1].get_addr64())
self.simulator.go(140)
self.assertEqual(self.nodes[ROUTER1].get_state(), 'leader')
tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py
+8 -8
View File
@@ -47,42 +47,42 @@ class Cert_5_5_4_SplitMergeRouters(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER3]
'allowlist': [LEADER, ROUTER3]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER4]
'allowlist': [LEADER, ROUTER4]
},
ROUTER3: {
'name': 'ROUTER_3',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER4: {
'name': 'ROUTER_4',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER2]
'allowlist': [ROUTER2]
},
}
def _setUpLeader(self):
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER].enable_allowlist()
self.nodes[LEADER].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py
+19 -19
View File
@@ -47,106 +47,106 @@ class Cert_5_5_5_SplitMergeREED(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15]
'allowlist': [ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER3]
'allowlist': [ROUTER3]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, REED1]
'allowlist': [LEADER, REED1]
},
ROUTER3: {
'name': 'ROUTER_3',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1]
'allowlist': [LEADER, ROUTER1]
},
5: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
6: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
7: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
8: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
9: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
10: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
11: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
12: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
13: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
14: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
REED1: {
'name': 'REED',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER2]
'allowlist': [ROUTER2]
},
}
@@ -168,8 +168,8 @@ class Cert_5_5_5_SplitMergeREED(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[REED1].get_state(), 'child')
self.nodes[ROUTER1].add_whitelist(self.nodes[REED1].get_addr64())
self.nodes[REED1].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER1].add_allowlist(self.nodes[REED1].get_addr64())
self.nodes[REED1].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[ROUTER3].stop()
self.simulator.go(140)
tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py
+8 -8
View File
@@ -46,36 +46,36 @@ class Cert_5_5_7_SplitMergeThreeWay(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ROUTER1, ROUTER2, ROUTER3]
'allowlist': [ROUTER1, ROUTER2, ROUTER3]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER1]
'allowlist': [LEADER1]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER1]
'allowlist': [LEADER1]
},
ROUTER3: {
'name': 'ROUTER_3',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER1]
'allowlist': [LEADER1]
},
}
def _setUpLeader1(self):
self.nodes[LEADER1].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER1].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER1].add_whitelist(self.nodes[ROUTER3].get_addr64())
self.nodes[LEADER1].enable_whitelist()
self.nodes[LEADER1].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[LEADER1].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER1].add_allowlist(self.nodes[ROUTER3].get_addr64())
self.nodes[LEADER1].enable_allowlist()
self.nodes[LEADER1].set_router_selection_jitter(1)
def test(self):
tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED1, SED1]
'allowlist': [LEADER, ED1, SED1]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, ED1, SED1]
'allowlist': [ROUTER, ED1, SED1]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED1, SED1]
'allowlist': [LEADER, ED1, SED1]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, ED1, SED1]
'allowlist': [ROUTER, ED1, SED1]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, ED1, SED1]
'allowlist': [ROUTER, ED1, SED1]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, ED1, SED1]
'allowlist': [ROUTER, ED1, SED1]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED1: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py
+21 -21
View File
@@ -47,105 +47,105 @@ class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15]
'allowlist': [ROUTER1, ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, REED1]
'allowlist': [LEADER, REED1]
},
ROUTER3: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
5: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
6: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
7: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
8: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
9: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
10: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
11: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
12: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
13: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
14: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER15: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
REED1: {
'name': 'REED',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER2]
'allowlist': [ROUTER2]
},
}
@@ -163,8 +163,8 @@ class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[REED1].get_state(), 'child')
self.nodes[ROUTER2].remove_whitelist(self.nodes[REED1].get_addr64())
self.nodes[REED1].remove_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[ROUTER2].remove_allowlist(self.nodes[REED1].get_addr64())
self.nodes[REED1].remove_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[LEADER].add_prefix('2001:2:0:3::/64', 'paros')
self.nodes[LEADER].register_netdata()
@@ -174,8 +174,8 @@ class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase):
self.simulator.go(2)
self.nodes[ROUTER2].add_whitelist(self.nodes[REED1].get_addr64())
self.nodes[REED1].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[ROUTER2].add_allowlist(self.nodes[REED1].get_addr64())
self.nodes[REED1].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.simulator.go(30)
self.simulator.go(600)
tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py
+5 -5
View File
@@ -50,28 +50,28 @@ class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED, SED]
'allowlist': [LEADER, ED, SED]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ED: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
SED: {
'name': 'SED',
@@ -79,7 +79,7 @@ class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py
+6 -6
View File
@@ -52,29 +52,29 @@ class Cert_5_7_01_CoapDiagCommands_A(thread_cert.TestCase):
TOPOLOGY = {
LEADER: {
'whitelist': [ROUTER1],
'allowlist': [ROUTER1],
},
ROUTER1: {
'whitelist': [LEADER, REED1, SED1, MED1, FED1],
'allowlist': [LEADER, REED1, SED1, MED1, FED1],
'router_selection_jitter': 1
},
REED1: {
'whitelist': [ROUTER1],
'allowlist': [ROUTER1],
'router_upgrade_threshold': 0
},
SED1: {
'is_mtd': True,
'mode': 's',
'whitelist': [ROUTER1],
'allowlist': [ROUTER1],
'timeout': config.DEFAULT_CHILD_TIMEOUT
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
FED1: {
'whitelist': [ROUTER1],
'allowlist': [ROUTER1],
'router_upgrade_threshold': 0
},
}
tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py
+2 -2
View File
@@ -44,7 +44,7 @@ class Cert_5_8_2_KeyIncrement(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
@@ -52,7 +52,7 @@ class Cert_5_8_2_KeyIncrement(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py
+2 -2
View File
@@ -45,7 +45,7 @@ class Cert_5_8_3_KeyIncrementRollOver(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
@@ -53,7 +53,7 @@ class Cert_5_8_3_KeyIncrementRollOver(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py
+2 -2
View File
@@ -41,13 +41,13 @@ class Cert_6_1_1_RouterAttach(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py
+3 -3
View File
@@ -47,20 +47,20 @@ class Cert_6_1_2_REEDAttach_MED(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [REED]
'allowlist': [REED]
},
REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, MED]
'allowlist': [LEADER, MED]
},
MED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [REED]
'allowlist': [REED]
},
}
tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py
+3 -3
View File
@@ -48,20 +48,20 @@ class Cert_6_1_2_REEDAttach_SED(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [REED]
'allowlist': [REED]
},
REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, SED]
'allowlist': [LEADER, SED]
},
SED: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [REED]
'allowlist': [REED]
},
}
tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py
+5 -5
View File
@@ -47,35 +47,35 @@ class Cert_6_1_3_RouterAttachConnectivity(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2, ROUTER3]
'allowlist': [ROUTER1, ROUTER2, ROUTER3]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER3]
'allowlist': [LEADER, ROUTER3]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ROUTER3: {
'name': 'ROUTER_3',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1, ED]
'allowlist': [LEADER, ROUTER1, ED]
},
ED: {
'name': 'ED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER2, ROUTER3]
'allowlist': [ROUTER2, ROUTER3]
},
}
tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py
+5 -5
View File
@@ -46,35 +46,35 @@ class Cert_6_1_5_REEDAttachConnectivity(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, REED1, REED2]
'allowlist': [ROUTER1, REED1, REED2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, REED2]
'allowlist': [LEADER, REED2]
},
REED1: {
'name': 'REED_1',
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, ROUTER1, ED]
'allowlist': [LEADER, ROUTER1, ED]
},
REED2: {
'name': 'REED_2',
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, (ED, -85)]
'allowlist': [LEADER, (ED, -85)]
},
ED: {
'name': 'ED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [REED1, REED2]
'allowlist': [REED1, REED2]
},
}
tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py
+4 -4
View File
@@ -43,25 +43,25 @@ class Cert_6_1_6_REEDAttachLinkQuality_ED(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, (ED, -85)]
'allowlist': [LEADER, (ED, -85)]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
}
tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py
+4 -4
View File
@@ -44,26 +44,26 @@ class Cert_6_1_6_REEDAttachLinkQuality_SED(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
REED: {
'mode': 'rsdn',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER, SED]
'allowlist': [LEADER, SED]
},
ROUTER2: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, (SED, -85)]
'allowlist': [LEADER, (SED, -85)]
},
SED: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [REED, ROUTER2]
'allowlist': [REED, ROUTER2]
},
}
tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py
+4 -4
View File
@@ -45,28 +45,28 @@ class Cert_6_1_7_RouterAttachLinkQuality(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, (ED, -85)]
'allowlist': [LEADER, (ED, -85)]
},
ED: {
'name': 'ED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
}
tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py
+9 -9
View File
@@ -46,34 +46,34 @@ class Cert_6_1_9_EDSynchronization(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ED, ROUTER2]
'allowlist': [ROUTER1, ED, ROUTER2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED, ROUTER3]
'allowlist': [LEADER, ED, ROUTER3]
},
ED: {
'name': 'ED',
'panid': 0xface,
'router_upgrade_threshold': 0,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
ROUTER2: {
'name': 'ROUTER_2',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED, ROUTER3]
'allowlist': [LEADER, ED, ROUTER3]
},
ROUTER3: {
'name': 'ROUTER_3',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [ED, ROUTER1, ROUTER2]
'allowlist': [ED, ROUTER1, ROUTER2]
},
}
@@ -98,10 +98,10 @@ class Cert_6_1_9_EDSynchronization(thread_cert.TestCase):
self.simulator.go(3)
self.assertEqual(self.nodes[ED].get_state(), 'child')
self.nodes[ED].add_whitelist(self.nodes[ROUTER1].get_addr64())
self.nodes[ED].add_whitelist(self.nodes[ROUTER2].get_addr64())
self.nodes[ED].add_whitelist(self.nodes[ROUTER3].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].add_allowlist(self.nodes[ROUTER1].get_addr64())
self.nodes[ED].add_allowlist(self.nodes[ROUTER2].get_addr64())
self.nodes[ED].add_allowlist(self.nodes[ROUTER3].get_addr64())
self.nodes[ED].enable_allowlist()
self.simulator.go(10)
def verify(self, pv):
tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py
+3 -3
View File
@@ -41,19 +41,19 @@ class Cert_6_2_1_NewPartition(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
ROUTER1: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py
+4 -4
View File
@@ -45,14 +45,14 @@ class Cert_6_2_2_NewPartition(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER1, ROUTER2]
'allowlist': [ROUTER1, ROUTER2]
},
ROUTER1: {
'name': 'ROUTER_1',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER2, ED]
'allowlist': [LEADER, ROUTER2, ED]
},
ROUTER2: {
'name': 'ROUTER_2',
@@ -60,14 +60,14 @@ class Cert_6_2_2_NewPartition(thread_cert.TestCase):
'network_id_timeout': 110,
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ROUTER1]
'allowlist': [LEADER, ROUTER1]
},
ED: {
'name': 'ED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER1]
'allowlist': [ROUTER1]
},
}
tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py
+5 -5
View File
@@ -44,14 +44,14 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ED: {
'name': 'ED',
@@ -59,7 +59,7 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': 10,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
@@ -78,8 +78,8 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase):
self.collect_ipaddrs()
self.nodes[ROUTER].stop()
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ED].get_addr64())
self.nodes[ED].add_allowlist(self.nodes[LEADER].get_addr64())
self.simulator.go(20)
self.assertEqual(self.nodes[ED].get_state(), 'child')
tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py
+6 -6
View File
@@ -43,7 +43,7 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'name': 'MED',
@@ -51,7 +51,7 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': 10,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
@@ -78,8 +78,8 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase):
if addr[0:10] == '2001:2:0:1':
self.assertTrue(self.nodes[LEADER].ping(addr))
self.nodes[LEADER].remove_whitelist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].remove_allowlist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paros')
self.nodes[LEADER].register_netdata()
@@ -89,8 +89,8 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase):
self.simulator.go(5)
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ED].get_addr64())
self.nodes[ED].add_allowlist(self.nodes[LEADER].get_addr64())
self.simulator.go(10)
addrs = self.nodes[ED].get_addrs()
tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py
+2 -2
View File
@@ -40,13 +40,13 @@ class Cert_6_4_1_LinkLocal(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py
+3 -3
View File
@@ -41,19 +41,19 @@ class Cert_5_3_2_RealmLocal(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED]
'allowlist': [LEADER, ED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
4: {},
}
tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py
+7 -7
View File
@@ -43,20 +43,20 @@ class Cert_6_5_1_ChildResetReattach(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'name': 'ED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
def _setUpEd(self):
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].add_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_allowlist()
def test(self):
self.nodes[LEADER].start()
@@ -67,8 +67,8 @@ class Cert_6_5_1_ChildResetReattach(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[ED].get_state(), 'child')
self.nodes[LEADER].remove_whitelist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].remove_allowlist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ED].reset()
self._setUpEd()
@@ -76,7 +76,7 @@ class Cert_6_5_1_ChildResetReattach(thread_cert.TestCase):
self.nodes[ED].start()
self.simulator.go(5)
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ED].get_addr64())
self.simulator.go(5)
self.assertEqual(self.nodes[ED].get_state(), 'child')
tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py
+7 -7
View File
@@ -40,19 +40,19 @@ class Cert_6_5_2_ChildResetReattach(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
def _setUpEd(self):
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].add_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_allowlist()
def test(self):
self.nodes[LEADER].start()
@@ -63,8 +63,8 @@ class Cert_6_5_2_ChildResetReattach(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[ED].get_state(), 'child')
self.nodes[LEADER].remove_whitelist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].remove_allowlist(self.nodes[ED].get_addr64())
self.nodes[ED].remove_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ED].reset()
self._setUpEd()
@@ -72,7 +72,7 @@ class Cert_6_5_2_ChildResetReattach(thread_cert.TestCase):
self.nodes[ED].start()
self.simulator.go(5)
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ED].get_addr64())
self.simulator.go(5)
self.assertEqual(self.nodes[ED].get_state(), 'child')
tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py
+4 -4
View File
@@ -44,7 +44,7 @@ class Cert_6_5_3_ChildResetSynchronize(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'name': 'ED',
@@ -52,13 +52,13 @@ class Cert_6_5_3_ChildResetSynchronize(thread_cert.TestCase):
'mode': 'rsn',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
def _setUpEd(self):
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].add_allowlist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_allowlist()
def test(self):
self.nodes[LEADER].start()
tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py
+2 -2
View File
@@ -44,7 +44,7 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'name': 'ED',
@@ -52,7 +52,7 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py
+2 -2
View File
@@ -45,7 +45,7 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ED]
'allowlist': [ED]
},
ED: {
'name': 'ED',
@@ -53,7 +53,7 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase):
'key_switch_guardtime': 0,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py
+4 -4
View File
@@ -55,26 +55,26 @@ class Cert_7_1_1_BorderRouterAsLeader(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, SED1, MED1]
'allowlist': [ROUTER, SED1, MED1]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED2, SED2]
'allowlist': [LEADER, ED2, SED2]
},
ED2: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED2: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py
+4 -4
View File
@@ -55,26 +55,26 @@ class Cert_7_1_3_BorderRouterAsLeader(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER, SED1, MED1]
'allowlist': [ROUTER, SED1, MED1]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
SED1: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
MED1: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
}
tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py
+4 -4
View File
@@ -49,21 +49,21 @@ class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase):
'name': 'LEADER',
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'name': 'ROUTER',
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED2, SED2]
'allowlist': [LEADER, ED2, SED2]
},
ED2: {
'name': 'MED',
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED2: {
'name': 'SED',
@@ -71,7 +71,7 @@ class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase):
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py
+4 -4
View File
@@ -45,26 +45,26 @@ class Cert_7_1_5_BorderRouterAsRouter(thread_cert.TestCase):
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
ROUTER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER, ED2, SED2]
'allowlist': [LEADER, ED2, SED2]
},
ED2: {
'is_mtd': True,
'mode': 'rsn',
'panid': 0xface,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
SED2: {
'is_mtd': True,
'mode': 's',
'panid': 0xface,
'timeout': config.DEFAULT_CHILD_TIMEOUT,
'whitelist': [ROUTER]
'allowlist': [ROUTER]
},
}
tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py
+4 -4
View File
@@ -87,11 +87,11 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[JOINER_ROUTER].get_state(), 'router')
self.nodes[COMMISSIONER].enable_whitelist()
self.nodes[COMMISSIONER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[COMMISSIONER].enable_allowlist()
self.nodes[COMMISSIONER].add_allowlist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_whitelist()
self.nodes[JOINER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_allowlist()
self.nodes[JOINER].add_allowlist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].interface_up()
self.nodes[JOINER].joiner_start('PSKD02')
tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py
+4 -4
View File
@@ -87,11 +87,11 @@ class Cert_8_2_02_JoinerRouter(thread_cert.TestCase):
self.simulator.go(5)
self.assertEqual(self.nodes[JOINER_ROUTER].get_state(), 'router')
self.nodes[COMMISSIONER].enable_whitelist()
self.nodes[COMMISSIONER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[COMMISSIONER].enable_allowlist()
self.nodes[COMMISSIONER].add_allowlist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_whitelist()
self.nodes[JOINER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_allowlist()
self.nodes[JOINER].add_allowlist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].interface_up()
self.nodes[JOINER].joiner_start('20DKSP')
tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py
+2 -2
View File
@@ -47,13 +47,13 @@ class Cert_9_2_02_MGMTCommissionerSet(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [COMMISSIONER]
'allowlist': [COMMISSIONER]
},
}
tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py
+4 -4
View File
@@ -57,14 +57,14 @@ class Cert_9_2_7_DelayTimer(thread_cert.TestCase):
'mode': 'rsdn',
'panid': 0xface,
'router_selection_jitter': 1,
'whitelist': [LEADER]
'allowlist': [LEADER]
},
LEADER: {
'mode': 'rsdn',
'panid': 0xface,
'partition_id': 0xffffffff,
'router_selection_jitter': 1,
'whitelist': [COMMISSIONER]
'allowlist': [COMMISSIONER]
},
ROUTER: {
'active_dataset': {
@@ -96,8 +96,8 @@ class Cert_9_2_7_DelayTimer(thread_cert.TestCase):
self.simulator.go(10)
self.assertEqual(self.nodes[ROUTER].get_state(), 'leader')
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER].get_addr64())
self.nodes[ROUTER].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[LEADER].add_allowlist(self.nodes[ROUTER].get_addr64())
self.nodes[ROUTER].add_allowlist(self.nodes[LEADER].get_addr64())
self.simulator.go(30)
self.assertEqual(self.nodes[COMMISSIONER].get_state(), 'router')

Some files were not shown because too many files have changed in this diff Show More