diff --git a/examples/platforms/cc1352/README.md b/examples/platforms/cc1352/README.md index 9c4c87ae0..76a40ca60 100644 --- a/examples/platforms/cc1352/README.md +++ b/examples/platforms/cc1352/README.md @@ -94,7 +94,6 @@ scan start state stop -whitelist ``` ### NCP example diff --git a/examples/platforms/cc2538/README.md b/examples/platforms/cc2538/README.md index d0e9af7ae..0106a4730 100644 --- a/examples/platforms/cc2538/README.md +++ b/examples/platforms/cc2538/README.md @@ -109,5 +109,4 @@ scan start state stop -whitelist ``` diff --git a/examples/platforms/cc2650/README.md b/examples/platforms/cc2650/README.md index 98e7095cd..f3009a92a 100644 --- a/examples/platforms/cc2650/README.md +++ b/examples/platforms/cc2650/README.md @@ -110,7 +110,6 @@ scan start state stop -whitelist ``` ### NCP example diff --git a/examples/platforms/cc2652/README.md b/examples/platforms/cc2652/README.md index edb2c7965..c87b8518f 100644 --- a/examples/platforms/cc2652/README.md +++ b/examples/platforms/cc2652/README.md @@ -94,7 +94,6 @@ scan start state stop -whitelist ``` ### NCP example diff --git a/examples/platforms/efr32mg1/README.md b/examples/platforms/efr32mg1/README.md index 17b5b655d..f6064ee3f 100644 --- a/examples/platforms/efr32mg1/README.md +++ b/examples/platforms/efr32mg1/README.md @@ -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. diff --git a/examples/platforms/efr32mg12/README.md b/examples/platforms/efr32mg12/README.md index 1e978dfe4..b4e0f35e0 100644 --- a/examples/platforms/efr32mg12/README.md +++ b/examples/platforms/efr32mg12/README.md @@ -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. diff --git a/examples/platforms/efr32mg13/README.md b/examples/platforms/efr32mg13/README.md index f44b1b1f2..2f787dd08 100644 --- a/examples/platforms/efr32mg13/README.md +++ b/examples/platforms/efr32mg13/README.md @@ -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. diff --git a/examples/platforms/efr32mg21/README.md b/examples/platforms/efr32mg21/README.md index ae6310a35..3a44648ae 100644 --- a/examples/platforms/efr32mg21/README.md +++ b/examples/platforms/efr32mg21/README.md @@ -125,7 +125,6 @@ scan start state stop -whitelist ``` 3. Start a Thread network as Leader. diff --git a/examples/platforms/gp712/README.md b/examples/platforms/gp712/README.md index aa9a058b8..f9c652650 100644 --- a/examples/platforms/gp712/README.md +++ b/examples/platforms/gp712/README.md @@ -68,5 +68,4 @@ scan start state stop -whitelist ``` diff --git a/examples/platforms/samr21/README.md b/examples/platforms/samr21/README.md index 79b64534d..6fc42009a 100644 --- a/examples/platforms/samr21/README.md +++ b/examples/platforms/samr21/README.md @@ -111,7 +111,6 @@ $ (gdb) c start state stop - whitelist ``` 3. Start a Thread network as Leader. diff --git a/examples/platforms/simulation/README.md b/examples/platforms/simulation/README.md index cc3bdb6f5..4f13c135e 100644 --- a/examples/platforms/simulation/README.md +++ b/examples/platforms/simulation/README.md @@ -68,5 +68,4 @@ scan start state stop -whitelist ``` diff --git a/include/openthread/error.h b/include/openthread/error.h index e57102685..d421432b7 100644 --- a/include/openthread/error.h +++ b/include/openthread/error.h @@ -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, diff --git a/include/openthread/instance.h b/include/openthread/instance.h index 0b3b829cb..613d49740 100644 --- a/include/openthread/instance.h +++ b/include/openthread/instance.h @@ -53,7 +53,7 @@ extern "C" { * @note This number versions both OpenThread platform and user APIs. * */ -#define OPENTHREAD_API_VERSION (27) +#define OPENTHREAD_API_VERSION (28) /** * @addtogroup api-instance diff --git a/include/openthread/link.h b/include/openthread/link.h index 9502c9520..e42b0b9f7 100644 --- a/include/openthread/link.h +++ b/include/openthread/link.h @@ -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; diff --git a/src/cli/README.md b/src/cli/README.md index a6c41718b..5e2cd92b3 100644 --- a/src/cli/README.md +++ b/src/cli/README.md @@ -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 ``` diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 69ac13e22..3c97064a3 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -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) { diff --git a/src/core/mac/mac_filter.cpp b/src/core/mac/mac_filter.cpp index 80dd27568..e7b95e013 100644 --- a/src/core/mac/mac_filter.cpp +++ b/src/core/mac/mac_filter.cpp @@ -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; } diff --git a/src/core/mac/mac_filter.hpp b/src/core/mac/mac_filter.hpp index 9d49875c4..a2183b672 100644 --- a/src/core/mac/mac_filter.hpp +++ b/src/core/mac/mac_filter.hpp @@ -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. diff --git a/src/lib/spinel/spinel.c b/src/lib/spinel/spinel.c index ae0753f48..f82178934 100644 --- a/src/lib/spinel/spinel.c +++ b/src/lib/spinel/spinel.c @@ -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: diff --git a/src/lib/spinel/spinel.h b/src/lib/spinel/spinel.h index 3cd74853f..a08c824fb 100644 --- a/src/lib/spinel/spinel.h +++ b/src/lib/spinel/spinel.h @@ -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). diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index d7c66234d..570979ea4 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -1812,7 +1812,7 @@ template <> otError NcpBase::HandlePropertyGet(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 diff --git a/src/ncp/ncp_base_dispatcher.cpp b/src/ncp/ncp_base_dispatcher.cpp index 7eadb8c45..c92c72d18 100644 --- a/src/ncp/ncp_base_dispatcher.cpp +++ b/src/ncp/ncp_base_dispatcher.cpp @@ -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 diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index 25f6d5146..b3987292f 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -2599,7 +2599,7 @@ template <> otError NcpBase::HandlePropertySet #if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE -template <> otError NcpBase::HandlePropertyGet(void) +template <> otError NcpBase::HandlePropertyGet(void) { otMacFilterEntry entry; otMacFilterIterator iterator = OT_MAC_FILTER_ITERATOR_INIT; @@ -2619,12 +2619,12 @@ exit: return error; } -template <> otError NcpBase::HandlePropertyGet(void) +template <> otError NcpBase::HandlePropertyGet(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(void) +template <> otError NcpBase::HandlePropertyGet(void) { otMacFilterEntry entry; otMacFilterIterator iterator = OT_MAC_FILTER_ITERATOR_INIT; @@ -2641,9 +2641,9 @@ exit: return error; } -template <> otError NcpBase::HandlePropertyGet(void) +template <> otError NcpBase::HandlePropertyGet(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(void) @@ -2666,7 +2666,7 @@ exit: return error; } -template <> otError NcpBase::HandlePropertySet(void) +template <> otError NcpBase::HandlePropertySet(void) { otError error = OT_ERROR_NONE; @@ -2709,19 +2709,19 @@ template <> otError NcpBase::HandlePropertySet(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(void) +template <> otError NcpBase::HandlePropertySet(void) { bool enabled; otError error = OT_ERROR_NONE; @@ -2731,7 +2731,7 @@ template <> otError NcpBase::HandlePropertySet otError NcpBase::HandlePropertySet(void) +template <> otError NcpBase::HandlePropertySet(void) { otError error = OT_ERROR_NONE; @@ -2760,19 +2760,19 @@ template <> otError NcpBase::HandlePropertySet(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(void) +template <> otError NcpBase::HandlePropertySet(void) { bool enabled; otError error = OT_ERROR_NONE; @@ -2782,7 +2782,7 @@ template <> otError NcpBase::HandlePropertySet otError NcpBase::HandlePropertyInsert(void) +template <> otError NcpBase::HandlePropertyInsert(void) { otError error = OT_ERROR_NONE; const otExtAddress *extAddress; @@ -3005,7 +3005,7 @@ exit: return error; } -template <> otError NcpBase::HandlePropertyInsert(void) +template <> otError NcpBase::HandlePropertyInsert(void) { otError error = OT_ERROR_NONE; const otExtAddress *extAddress; @@ -3072,7 +3072,7 @@ exit: #if OPENTHREAD_CONFIG_MAC_FILTER_ENABLE -template <> otError NcpBase::HandlePropertyRemove(void) +template <> otError NcpBase::HandlePropertyRemove(void) { otError error = OT_ERROR_NONE; const otExtAddress *extAddress = nullptr; @@ -3085,7 +3085,7 @@ exit: return error; } -template <> otError NcpBase::HandlePropertyRemove(void) +template <> otError NcpBase::HandlePropertyRemove(void) { otError error = OT_ERROR_NONE; const otExtAddress *extAddress = nullptr; diff --git a/src/posix/platform/README.md b/src/posix/platform/README.md index 6a0292865..dea7833c6 100644 --- a/src/posix/platform/README.md +++ b/src/posix/platform/README.md @@ -54,5 +54,5 @@ scan start state stop -whitelist +allowlist ``` diff --git a/tests/scripts/expect/cli-macfilter.exp b/tests/scripts/expect/cli-macfilter.exp index 579e1094c..bd8c76b5a 100755 --- a/tests/scripts/expect/cli-macfilter.exp +++ b/tests/scripts/expect/cli-macfilter.exp @@ -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" diff --git a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py index be374488d..ff119d61f 100755 --- a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py index 529c344d5..c3f0829e7 100755 --- a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py index 98fe590dd..97fda114e 100755 --- a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py index 714a77a9a..f5a098535 100755 --- a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py index 318ddc86c..8675bf7ae 100755 --- a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py index 2b4c94e7d..53367d907 100755 --- a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py +++ b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py index 6bb5ec867..f1a310b22 100755 --- a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py +++ b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py index c66605fb0..9272f3a34 100755 --- a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py index a8959bee6..ee0511ef1 100755 --- a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py index cc252cc54..c328c1f24 100755 --- a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py index 7d15a10b8..240ea5716 100755 --- a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py index 0c04abce0..bae6b2f1a 100755 --- a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py +++ b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py @@ -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) diff --git a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py index e3d086272..d791b592a 100755 --- a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py +++ b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py index fb647eba1..eab15c30c 100755 --- a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py +++ b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py index d93348c07..ade0c0503 100755 --- a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py +++ b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py index 137ef7a89..3d1e1ffbc 100755 --- a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py index 83f180f46..d91461eaa 100755 --- a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py @@ -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. diff --git a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py index 4d95be447..40b877de9 100755 --- a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py @@ -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) diff --git a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py index 897e8c45f..869e6d0f6 100755 --- a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py index dd7704ec2..2fa23d8da 100755 --- a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py index 6ba5ad3e4..6580fc02d 100755 --- a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py +++ b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py index 51ca4eb4f..d6631c4a6 100755 --- a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py @@ -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. diff --git a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py index 4ed1c0138..c3627572e 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py index 4f86b417f..66074c6dc 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py index d0cd02b05..5130b0756 100755 --- a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py +++ b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py index a2d66a56a..8bee8e06d 100755 --- a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py +++ b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py index a89d14b26..2e5eca97c 100755 --- a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py index 9ac7567ef..069569a58 100755 --- a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py index 7d3598751..cb5f10beb 100755 --- a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py +++ b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py index 3da97e30a..06a9957c8 100755 --- a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py @@ -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 diff --git a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py index 9bafbf258..1a3fdf045 100755 --- a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py index 3ebc304dc..aca59380d 100755 --- a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py +++ b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py index e0baba347..32557c26b 100755 --- a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py +++ b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py index 21fa130f6..feaef716a 100755 --- a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py +++ b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py @@ -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) diff --git a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py index 7d9ecd4e7..15d7ead0d 100755 --- a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py +++ b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py index a0466908f..8045ef5af 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py index 5fd1ae9ff..d8c084c41 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py index f8a38d7ff..5e9395be6 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py index 861cadbb2..19295b2cf 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py index 69d4b7687..f4e0425e0 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py index f77e8ae44..b3355a5ce 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py index 799758c10..336c5e471 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -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) diff --git a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py index 9bd4f77ce..ecdd57cfb 100755 --- a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py +++ b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py index 4eafce9ba..1aadbad72 100755 --- a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py +++ b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py @@ -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 }, } diff --git a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py index b97ce930c..dc11c0ae9 100755 --- a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py index 63b4ef59f..940e7d07b 100755 --- a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py index 23f41a1aa..9ef4c008d 100755 --- a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py index 4acdf7383..60d61a227 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py index a4d7fe916..62f0d2c89 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py index 5b10c00a0..626d89c25 100755 --- a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py index 37f34c565..2410631ca 100755 --- a/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py index 6d96b5480..b6ba8b713 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py index 279e266a6..9bcbba2e0 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py index 43f11d72a..6ce7cc610 100755 --- a/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py b/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py index 911576ea6..28bf093ec 100755 --- a/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_6_1_09_EDSynchronization.py @@ -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): diff --git a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py index 86ba12f86..c29b68cba 100755 --- a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py index b5b4dc00f..fabc45e42 100755 --- a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py index 56ddd63d1..e9d8e2c60 100755 --- a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py +++ b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py index c9da02fb0..68996d765 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -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() diff --git a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py index b2f7c55e0..13397d23c 100755 --- a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py index b979f613d..a465d81a9 100755 --- a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py @@ -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: {}, } diff --git a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py index ee44c50d9..211dd9007 100755 --- a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py index a66c7189d..be45cfc8b 100755 --- a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py b/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py index d890ebe95..b5d8e54b2 100755 --- a/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py +++ b/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py @@ -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() diff --git a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py index 0944c0e38..72504cdbd 100755 --- a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py index 7da4d0811..1e3c3917f 100755 --- a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py index f8dc6f7c5..1733cb77d 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py index 2ec6d7f38..d37fb2b10 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py index a866d64db..01716540c 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py index ab4bb336f..41e772772 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py index cfd36bc5b..c74cb3d39 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py index ab7d83a05..1fe3d8d81 100755 --- a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py index 6951e9f40..5497da878 100755 --- a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py index aa51c85c9..22e01249a 100755 --- a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py +++ b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py @@ -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] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py index 323ed9809..2fb10abdb 100755 --- a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py +++ b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py index 75e8e8111..615897275 100755 --- a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py +++ b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py @@ -60,7 +60,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'active_dataset': { @@ -69,7 +69,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rsdn', - 'whitelist': [COMMISSIONER, ROUTER, ED, SED] + 'allowlist': [COMMISSIONER, ROUTER, ED, SED] }, ROUTER: { 'active_dataset': { @@ -79,7 +79,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, ED: { 'channel': CHANNEL_INIT, @@ -87,7 +87,7 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'mode': 'rsn', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, SED: { 'channel': CHANNEL_INIT, @@ -95,23 +95,23 @@ class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): 'mode': 's', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - '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 _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() self.nodes[ED].set_timeout(config.DEFAULT_CHILD_TIMEOUT) def _setUpSed(self): - self.nodes[SED].add_whitelist(self.nodes[LEADER].get_addr64()) - self.nodes[SED].enable_whitelist() + self.nodes[SED].add_allowlist(self.nodes[LEADER].get_addr64()) + self.nodes[SED].enable_allowlist() self.nodes[SED].set_timeout(config.DEFAULT_CHILD_TIMEOUT) def test(self): diff --git a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py index b8706e167..a81f71b3b 100755 --- a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py @@ -55,7 +55,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'active_dataset': { @@ -66,7 +66,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'mode': 'rsdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'active_dataset': { @@ -76,7 +76,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ROUTER2] + 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'active_dataset': { @@ -87,7 +87,7 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'mode': 'rsdn', 'network_id_timeout': 100, 'router_selection_jitter': 1, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } @@ -119,8 +119,8 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): ) self.simulator.go(5) - self.nodes[LEADER].remove_whitelist(self.nodes[ROUTER1].get_addr64()) - self.nodes[ROUTER1].remove_whitelist(self.nodes[LEADER].get_addr64()) + self.nodes[LEADER].remove_allowlist(self.nodes[ROUTER1].get_addr64()) + self.nodes[ROUTER1].remove_allowlist(self.nodes[LEADER].get_addr64()) self.simulator.go(140) self.assertEqual(self.nodes[ROUTER1].get_state(), 'router') @@ -135,8 +135,8 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): ) self.simulator.go(5) - self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64()) - self.nodes[ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64()) + self.nodes[LEADER].add_allowlist(self.nodes[ROUTER1].get_addr64()) + self.nodes[ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64()) self.simulator.go(200) self.assertEqual(self.nodes[ROUTER1].get_state(), 'router') diff --git a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py index 0ebeebe5e..edf40ec98 100755 --- a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py @@ -59,7 +59,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'active_dataset': { @@ -70,7 +70,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'mode': 'rsdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'active_dataset': { @@ -80,14 +80,14 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ED1, SED1] + 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'channel': 19, 'is_mtd': True, 'mode': 'rsn', 'panid': 0xface, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, SED1: { 'channel': 19, @@ -95,7 +95,7 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'mode': 's', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } @@ -137,8 +137,8 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): print(self.nodes[ED1].get_channel()) print(self.nodes[SED1].get_channel()) - self.nodes[LEADER].remove_whitelist(self.nodes[ROUTER1].get_addr64()) - self.nodes[ROUTER1].remove_whitelist(self.nodes[LEADER].get_addr64()) + self.nodes[LEADER].remove_allowlist(self.nodes[ROUTER1].get_addr64()) + self.nodes[ROUTER1].remove_allowlist(self.nodes[LEADER].get_addr64()) self.simulator.go(160) print(self.nodes[COMMISSIONER].get_channel()) @@ -159,8 +159,8 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): self.assertEqual(self.nodes[ED1].get_channel(), CHANNEL_FINAL) self.assertEqual(self.nodes[SED1].get_channel(), CHANNEL_FINAL) - self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64()) - self.nodes[ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64()) + self.nodes[LEADER].add_allowlist(self.nodes[ROUTER1].get_addr64()) + self.nodes[ROUTER1].add_allowlist(self.nodes[LEADER].get_addr64()) self.simulator.go(60) self.assertEqual(self.nodes[COMMISSIONER].get_state(), 'router') diff --git a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py index 13cef0360..a3572d5e6 100755 --- a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py +++ b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py @@ -60,7 +60,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'active_dataset': { @@ -71,7 +71,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'active_dataset': { @@ -82,7 +82,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ED1, SED1] + 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'channel': CHANNEL_INIT, @@ -90,7 +90,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'masterkey': '000102030405060708090a0b0c0d0e0f', 'mode': 'rsn', 'panid': PANID_INIT, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, SED1: { 'channel': CHANNEL_INIT, @@ -99,7 +99,7 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'mode': 's', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py index be2e522d7..50cebddca 100755 --- a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py +++ b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py @@ -57,7 +57,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'channel': DATASET1_CHANNEL }, 'mode': 'rsdn', - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, ROUTER1: { 'active_dataset': { @@ -67,7 +67,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER1, LEADER2] + 'allowlist': [LEADER1, LEADER2] }, LEADER2: { 'active_dataset': { @@ -77,7 +77,7 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [ROUTER1, ROUTER2] + 'allowlist': [ROUTER1, ROUTER2] }, ROUTER2: { 'active_dataset': { @@ -87,14 +87,14 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER2, MED] + 'allowlist': [LEADER2, MED] }, MED: { 'channel': DATASET2_CHANNEL, 'is_mtd': True, 'mode': 'rsn', 'panid': DATASET2_PANID, - 'whitelist': [ROUTER2] + 'allowlist': [ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py index f1f3c4485..5117403c7 100755 --- a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py +++ b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py @@ -45,24 +45,24 @@ class Cert_9_2_13_EnergyScan(thread_cert.TestCase): 'mode': 'rsdn', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'mode': 'rsdn', 'panid': 0xface, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'mode': 'rsdn', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER, ED1] + 'allowlist': [LEADER, ED1] }, ED1: { 'is_mtd': True, 'mode': 'rs', 'panid': 0xface, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py index 07b289193..6ee32d614 100755 --- a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py +++ b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py @@ -48,26 +48,26 @@ class Cert_9_2_14_PanIdQuery(thread_cert.TestCase): 'mode': 'rsdn', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER1] + 'allowlist': [LEADER1] }, LEADER1: { 'name': 'LEADER_1', 'mode': 'rsdn', 'panid': 0xface, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rsdn', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER1, LEADER2] + 'allowlist': [LEADER1, LEADER2] }, LEADER2: { 'name': 'LEADER_2', 'mode': 'rsdn', 'panid': 0xdead, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py index f2668e437..47b0f335a 100755 --- a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py @@ -57,7 +57,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', @@ -69,7 +69,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'mode': 'rsdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER_1', @@ -80,7 +80,7 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ROUTER2] + 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', @@ -91,13 +91,13 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', '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): diff --git a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py index 434da5a05..03301f32d 100755 --- a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py @@ -58,7 +58,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', @@ -70,7 +70,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'mode': 'rsdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER_1', @@ -81,7 +81,7 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ROUTER2] + 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', @@ -92,13 +92,13 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): }, 'mode': 'rsdn', '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): diff --git a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py index 765e89539..577b5d882 100755 --- a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py +++ b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py @@ -58,7 +58,7 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [ED1] + 'allowlist': [ED1] }, LEADER2: { 'name': 'LEADER_2', @@ -78,7 +78,7 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): 'mode': 'rsn', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [LEADER1] + 'allowlist': [LEADER1] }, } @@ -96,8 +96,8 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): self.assertEqual(self.nodes[ED1].get_state(), 'child') self.nodes[LEADER1].stop() - self.nodes[LEADER2].add_whitelist(self.nodes[ED1].get_addr64()) - self.nodes[ED1].add_whitelist(self.nodes[LEADER2].get_addr64()) + self.nodes[LEADER2].add_allowlist(self.nodes[ED1].get_addr64()) + self.nodes[ED1].add_allowlist(self.nodes[LEADER2].get_addr64()) self.simulator.go(20) self.assertEqual(self.nodes[ED1].get_state(), 'child') diff --git a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py index 428aeeac4..42491c7cc 100755 --- a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py +++ b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py @@ -64,7 +64,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', @@ -77,7 +77,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'mode': 'rsdn', 'partition_id': 0xffffffff, 'router_selection_jitter': 1, - 'whitelist': [COMMISSIONER, ROUTER1] + 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER_1', @@ -89,7 +89,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): }, 'mode': 'rsdn', 'router_selection_jitter': 1, - 'whitelist': [LEADER, ED1, SED1] + 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'name': 'ED', @@ -98,7 +98,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'masterkey': KEY1, 'mode': 'rsn', 'panid': PANID_INIT, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, SED1: { 'name': 'SED', @@ -108,7 +108,7 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'mode': 's', 'panid': PANID_INIT, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [ROUTER1] + 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Test_MacScan.py b/tests/scripts/thread-cert/Test_MacScan.py index 8595d32bb..d74763725 100755 --- a/tests/scripts/thread-cert/Test_MacScan.py +++ b/tests/scripts/thread-cert/Test_MacScan.py @@ -43,14 +43,14 @@ class Test_MacScan(thread_cert.TestCase): 'mode': 'rsdn', 'network_name': 'OpenThread', 'panid': 0xface, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, ROUTER: { 'channel': 12, 'mode': 'rsdn', 'network_name': 'OpenThread', 'panid': 0xface, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/node.py b/tests/scripts/thread-cert/node.py index fd4092668..406687123 100755 --- a/tests/scripts/thread-cert/node.py +++ b/tests/scripts/thread-cert/node.py @@ -444,22 +444,22 @@ class Node: self.send_command(cmd) self._expect('Done') - def clear_whitelist(self): + def clear_allowlist(self): cmd = 'macfilter addr clear' self.send_command(cmd) self._expect('Done') - def enable_whitelist(self): - cmd = 'macfilter addr whitelist' + def enable_allowlist(self): + cmd = 'macfilter addr allowlist' self.send_command(cmd) self._expect('Done') - def disable_whitelist(self): + def disable_allowlist(self): cmd = 'macfilter addr disable' self.send_command(cmd) self._expect('Done') - def add_whitelist(self, addr, rssi=None): + def add_allowlist(self, addr, rssi=None): cmd = 'macfilter addr add %s' % addr if rssi is not None: @@ -618,7 +618,7 @@ class Node: self.send_command(cmd) self._expect('Done') - def remove_whitelist(self, addr): + def remove_allowlist(self, addr): cmd = 'macfilter addr remove %s' % addr self.send_command(cmd) self._expect('Done') diff --git a/tests/scripts/thread-cert/test_coap_observe.py b/tests/scripts/thread-cert/test_coap_observe.py index ae1161ba2..55221c75e 100755 --- a/tests/scripts/thread-cert/test_coap_observe.py +++ b/tests/scripts/thread-cert/test_coap_observe.py @@ -48,13 +48,13 @@ class TestCoapObserve(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] }, } diff --git a/tests/scripts/thread-cert/test_coaps.py b/tests/scripts/thread-cert/test_coaps.py index 98d74d920..55e651013 100755 --- a/tests/scripts/thread-cert/test_coaps.py +++ b/tests/scripts/thread-cert/test_coaps.py @@ -43,13 +43,13 @@ class TestCoaps(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] }, } diff --git a/tests/scripts/thread-cert/test_ipv6_fragmentation.py b/tests/scripts/thread-cert/test_ipv6_fragmentation.py index e3334337c..09b21db73 100755 --- a/tests/scripts/thread-cert/test_ipv6_fragmentation.py +++ b/tests/scripts/thread-cert/test_ipv6_fragmentation.py @@ -44,13 +44,13 @@ class TestIPv6Fragmentation(thread_cert.TestCase): LEADER: { 'mode': 'rsdn', 'panid': 0xcafe, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rsdn', 'panid': 0xcafe, 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_ipv6_source_selection.py b/tests/scripts/thread-cert/test_ipv6_source_selection.py index 58df28c9d..af7fd119b 100755 --- a/tests/scripts/thread-cert/test_ipv6_source_selection.py +++ b/tests/scripts/thread-cert/test_ipv6_source_selection.py @@ -43,13 +43,13 @@ class TestIPv6SourceSelection(thread_cert.TestCase): LEADER: { 'mode': 'rsdn', 'panid': 0xcafe, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rsdn', 'panid': 0xcafe, 'router_selection_jitter': 1, - 'whitelist': [LEADER] + 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_on_mesh_prefix.py b/tests/scripts/thread-cert/test_on_mesh_prefix.py index c2d0fd2b3..688a65c39 100755 --- a/tests/scripts/thread-cert/test_on_mesh_prefix.py +++ b/tests/scripts/thread-cert/test_on_mesh_prefix.py @@ -45,26 +45,26 @@ class Test_OnMeshPrefix(thread_cert.TestCase): LEADER: { 'mode': 'rsdn', 'panid': 0xface, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rsdn', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER, ED1, SED1] + 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'is_mtd': True, 'mode': 'rsn', 'panid': 0xface, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, SED1: { 'is_mtd': True, 'mode': 's', 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, - 'whitelist': [ROUTER] + 'allowlist': [ROUTER] }, } diff --git a/tests/scripts/thread-cert/test_reset.py b/tests/scripts/thread-cert/test_reset.py index a87ddeecd..e56fb4f46 100755 --- a/tests/scripts/thread-cert/test_reset.py +++ b/tests/scripts/thread-cert/test_reset.py @@ -41,19 +41,19 @@ class TestReset(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] }, } diff --git a/tests/scripts/thread-cert/test_route_table.py b/tests/scripts/thread-cert/test_route_table.py index 42bf9eedd..1db0f8bba 100755 --- a/tests/scripts/thread-cert/test_route_table.py +++ b/tests/scripts/thread-cert/test_route_table.py @@ -45,19 +45,19 @@ class TestRouteTable(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] }, } diff --git a/tests/scripts/thread-cert/test_service.py b/tests/scripts/thread-cert/test_service.py index e6cd4d0e4..4be81cc61 100755 --- a/tests/scripts/thread-cert/test_service.py +++ b/tests/scripts/thread-cert/test_service.py @@ -57,7 +57,7 @@ class Test_Service(thread_cert.TestCase): 'mode': 'rsdn', 'network_name': 'OpenThread', 'panid': 0xface, - 'whitelist': [ROUTER1, ROUTER2] + 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'channel': 12, @@ -65,7 +65,7 @@ class Test_Service(thread_cert.TestCase): 'network_name': 'OpenThread', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER, ROUTER2] + 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'channel': 12, @@ -73,7 +73,7 @@ class Test_Service(thread_cert.TestCase): 'network_name': 'OpenThread', 'panid': 0xface, 'router_selection_jitter': 1, - 'whitelist': [LEADER, ROUTER1] + 'allowlist': [LEADER, ROUTER1] }, } diff --git a/tests/scripts/thread-cert/thread_cert.py b/tests/scripts/thread-cert/thread_cert.py index 753600863..46bb09428 100644 --- a/tests/scripts/thread-cert/thread_cert.py +++ b/tests/scripts/thread-cert/thread_cert.py @@ -51,7 +51,7 @@ DEFAULT_PARAMS = { 'is_bbr': False, 'mode': 'rsdn', 'panid': 0xface, - 'whitelist': None, + 'allowlist': None, 'version': '1.1', } """Default configurations when creating nodes.""" @@ -162,18 +162,18 @@ class TestCase(NcpSupportMixin, unittest.TestCase): if 'max_children' in params: self.nodes[i].set_max_children(params['max_children']) - # we have to add whitelist after nodes are all created + # we have to add allowlist after nodes are all created for i, params in initial_topology.items(): - whitelist = params['whitelist'] - if not whitelist: + allowlist = params['allowlist'] + if not allowlist: continue - for j in whitelist: + for j in allowlist: rssi = None if isinstance(j, tuple): j, rssi = j - self.nodes[i].add_whitelist(self.nodes[j].get_addr64(), rssi=rssi) - self.nodes[i].enable_whitelist() + self.nodes[i].add_allowlist(self.nodes[j].get_addr64(), rssi=rssi) + self.nodes[i].enable_allowlist() self._inspector = debug.Inspector(self) self._collect_test_info_after_setup() diff --git a/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py b/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py index f88db4720..c351a53cc 100755 --- a/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py +++ b/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py @@ -73,16 +73,16 @@ class TestBackboneRouterService(thread_cert.TestCase): TOPOLOGY = { LEADER_1_1: { 'version': '1.1', - 'whitelist': [BBR_1, BBR_2], + 'allowlist': [BBR_1, BBR_2], }, BBR_1: { 'version': '1.2', - 'whitelist': [LEADER_1_1, BBR_2], + 'allowlist': [LEADER_1_1, BBR_2], 'is_bbr': True }, BBR_2: { 'version': '1.2', - 'whitelist': [LEADER_1_1, BBR_1], + 'allowlist': [LEADER_1_1, BBR_1], 'is_bbr': True }, } diff --git a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py index efa2e128e..89b7901d8 100755 --- a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py +++ b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py @@ -103,26 +103,26 @@ class TestDomainUnicastAddress(thread_cert.TestCase): TOPOLOGY = { BBR_1: { 'version': '1.2', - 'whitelist': [ROUTER_1_1, ROUTER_1_2], + 'allowlist': [ROUTER_1_1, ROUTER_1_2], 'is_bbr': True }, ROUTER_1_1: { 'version': '1.1', - 'whitelist': [BBR_1, SED_1_2] + 'allowlist': [BBR_1, SED_1_2] }, ROUTER_1_2: { 'version': '1.2', - 'whitelist': [BBR_1, MED_1_2] + 'allowlist': [BBR_1, MED_1_2] }, MED_1_2: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], }, SED_1_2: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, } """All nodes are created with default configurations""" diff --git a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py index 7fddbf1a7..8af8e06d2 100755 --- a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address_registration.py @@ -114,44 +114,44 @@ class TestDomainUnicastAddressRegistration(thread_cert.TestCase): TOPOLOGY = { BBR_1: { 'version': '1.2', - 'whitelist': [ROUTER_1_1, ROUTER_1_2], + 'allowlist': [ROUTER_1_1, ROUTER_1_2], 'is_bbr': True }, ROUTER_1_1: { 'version': '1.1', - 'whitelist': [BBR_1, FED_1_2_1, MED_1_2_1, SED_1_2_1] + 'allowlist': [BBR_1, FED_1_2_1, MED_1_2_1, SED_1_2_1] }, ROUTER_1_2: { 'version': '1.2', - 'whitelist': [BBR_1, FED_1_2_2, MED_1_2_2, SED_1_2_2] + 'allowlist': [BBR_1, FED_1_2_2, MED_1_2_2, SED_1_2_2] }, FED_1_2_1: { 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, MED_1_2_1: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, SED_1_2_1: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, FED_1_2_2: { 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], }, MED_1_2_2: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], }, SED_1_2_2: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], }, } """All nodes are created with default configurations""" diff --git a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py index 6a7902088..60d326312 100755 --- a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py +++ b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py @@ -133,14 +133,14 @@ class SED_EnhancedKeepAlive(thread_cert.TestCase): self.assertTrue(self.nodes[SED_1].ping(leader_aloc, timeout=USER_POLL_PERIOD * 2)) # 6 - Timeout Child - self.nodes[LEADER].enable_whitelist() - self.nodes[SED_1].enable_whitelist() + self.nodes[LEADER].enable_allowlist() + self.nodes[SED_1].enable_allowlist() self.nodes[SED_1].set_pollperiod(CHILD_TIMEOUT * 1000 * 2) self.simulator.go(CHILD_TIMEOUT + 1) self.assertEqual(self.nodes[SED_1].get_state(), 'child') self.nodes[SED_1].set_pollperiod(USER_POLL_PERIOD * 1000) - self.nodes[LEADER].disable_whitelist() - self.nodes[SED_1].disable_whitelist() + self.nodes[LEADER].disable_allowlist() + self.nodes[SED_1].disable_allowlist() self.assertFalse(self.nodes[SED_1].ping(leader_aloc, timeout=USER_POLL_PERIOD * 2)) self.flush_all() @@ -159,20 +159,20 @@ class SED_EnhancedKeepAlive(thread_cert.TestCase): self.flush_all() # 8 - Verify enhanced keep-alive works - self.nodes[LEADER].enable_whitelist() - self.nodes[SED_1].enable_whitelist() + self.nodes[LEADER].enable_allowlist() + self.nodes[SED_1].enable_allowlist() self.nodes[SED_1].set_pollperiod(CHILD_TIMEOUT * 1000 * 2) self.simulator.go(CHILD_TIMEOUT // 2) self.assertEqual(self.nodes[SED_1].get_state(), 'child') - self.nodes[LEADER].disable_whitelist() - self.nodes[SED_1].disable_whitelist() + self.nodes[LEADER].disable_allowlist() + self.nodes[SED_1].disable_allowlist() non_exist_addr = leader_aloc.replace('fc00', 'fc12') self.assertFalse(self.nodes[SED_1].ping(non_exist_addr)) - self.nodes[LEADER].enable_whitelist() - self.nodes[SED_1].enable_whitelist() + self.nodes[LEADER].enable_allowlist() + self.nodes[SED_1].enable_allowlist() self.simulator.go(CHILD_TIMEOUT // 2) - self.nodes[LEADER].disable_whitelist() - self.nodes[SED_1].disable_whitelist() + self.nodes[LEADER].disable_allowlist() + self.nodes[SED_1].disable_allowlist() self.nodes[SED_1].set_pollperiod(USER_POLL_PERIOD * 1000) self.assertTrue(self.nodes[SED_1].ping(leader_aloc, timeout=USER_POLL_PERIOD * 2)) diff --git a/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py b/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py index c6df7808c..78bf24ee8 100755 --- a/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_multicast_listener_registration.py @@ -76,48 +76,48 @@ class TestMulticastListenerRegistration(thread_cert.TestCase): TOPOLOGY = { BBR_1: { 'version': '1.2', - 'whitelist': [BBR_2, ROUTER_1_2], + 'allowlist': [BBR_2, ROUTER_1_2], 'is_bbr': True, 'router_selection_jitter': 1, }, BBR_2: { 'version': '1.2', - 'whitelist': [BBR_1, ROUTER_1_2, ROUTER_1_1], + 'allowlist': [BBR_1, ROUTER_1_2, ROUTER_1_1], 'is_bbr': True, 'router_selection_jitter': 1, }, ROUTER_1_2: { 'version': '1.2', - 'whitelist': [BBR_1, BBR_2, SED_1, MED_1, MED_2, FED_1], + 'allowlist': [BBR_1, BBR_2, SED_1, MED_1, MED_2, FED_1], 'router_selection_jitter': 1, }, ROUTER_1_1: { 'version': '1.1', - 'whitelist': [BBR_2], + 'allowlist': [BBR_2], 'router_selection_jitter': 1, }, MED_1: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, MED_2: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, SED_1: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, FED_1: { 'mode': 'rsdn', 'version': '1.2', - 'whitelist': [ROUTER_1_2], + 'allowlist': [ROUTER_1_2], 'router_upgrade_threshold': 0, 'timeout': config.DEFAULT_CHILD_TIMEOUT, }, @@ -801,8 +801,8 @@ class TestMulticastListenerRegistration(thread_cert.TestCase): # Turn off Router 1.2 and turn on Router 1.1 self.nodes[ROUTER_1_2].stop() for id in [FED_1, MED_1, SED_1]: - self.nodes[ROUTER_1_1].add_whitelist(self.nodes[id].get_addr64()) - self.nodes[id].add_whitelist(self.nodes[ROUTER_1_1].get_addr64()) + self.nodes[ROUTER_1_1].add_allowlist(self.nodes[id].get_addr64()) + self.nodes[id].add_allowlist(self.nodes[ROUTER_1_1].get_addr64()) self.simulator.go(config.DEFAULT_CHILD_TIMEOUT + WAIT_REDUNDANCE) self.assertEqual(self.nodes[id].get_state(), 'child') diff --git a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py index 6183760ee..52c594823 100755 --- a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py @@ -98,41 +98,41 @@ class TestMulticastRegistration(thread_cert.TestCase): TOPOLOGY = { LEADER_1_2: { 'version': '1.2', - 'whitelist': [MED_1_2, SED_1_2, MED_1_1, SED_1_1, ROUTER_1_1], + 'allowlist': [MED_1_2, SED_1_2, MED_1_1, SED_1_1, ROUTER_1_1], }, MED_1_2: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [LEADER_1_2], + 'allowlist': [LEADER_1_2], }, SED_1_2: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [LEADER_1_2], + 'allowlist': [LEADER_1_2], }, MED_1_1: { 'mode': 'rsn', 'version': '1.1', - 'whitelist': [LEADER_1_2], + 'allowlist': [LEADER_1_2], }, SED_1_1: { 'mode': 'sn', 'version': '1.1', - 'whitelist': [LEADER_1_2], + 'allowlist': [LEADER_1_2], }, ROUTER_1_1: { 'version': '1.1', - 'whitelist': [LEADER_1_2, MED_1_2_2, SED_1_2_2], + 'allowlist': [LEADER_1_2, MED_1_2_2, SED_1_2_2], }, MED_1_2_2: { 'mode': 'rsn', 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, SED_1_2_2: { 'mode': 'sn', 'version': '1.2', - 'whitelist': [ROUTER_1_1], + 'allowlist': [ROUTER_1_1], }, } """All nodes are created with default configurations""" diff --git a/tests/scripts/thread-cert/v1_2_test_parent_selection.py b/tests/scripts/thread-cert/v1_2_test_parent_selection.py index e094b4f0b..91a30b57f 100755 --- a/tests/scripts/thread-cert/v1_2_test_parent_selection.py +++ b/tests/scripts/thread-cert/v1_2_test_parent_selection.py @@ -72,33 +72,33 @@ class TestParentSelection(thread_cert.TestCase): TOPOLOGY = { LEADER_1_2: { 'version': '1.2', - 'whitelist': [REED_1_2, ROUTER_1_2, REED_1_1, ROUTER_1_1, MED_1_1], + 'allowlist': [REED_1_2, ROUTER_1_2, REED_1_1, ROUTER_1_1, MED_1_1], }, ROUTER_1_1: { 'version': '1.1', - 'whitelist': [LEADER_1_2, REED_1_2, MED_1_2, MED_1_1], + 'allowlist': [LEADER_1_2, REED_1_2, MED_1_2, MED_1_1], }, REED_1_2: { 'version': '1.2', - 'whitelist': [ROUTER_1_2, ROUTER_1_1, LEADER_1_2], + 'allowlist': [ROUTER_1_2, ROUTER_1_1, LEADER_1_2], }, ROUTER_1_2: { 'version': '1.2', - 'whitelist': [REED_1_2, MED_1_2, REED_1_1, LEADER_1_2], + 'allowlist': [REED_1_2, MED_1_2, REED_1_1, LEADER_1_2], }, REED_1_1: { 'version': '1.1', - 'whitelist': [ROUTER_1_2, LEADER_1_2] + 'allowlist': [ROUTER_1_2, LEADER_1_2] }, MED_1_1: { 'mode': 'rs', 'version': '1.1', - 'whitelist': [LEADER_1_2, ROUTER_1_1], + 'allowlist': [LEADER_1_2, ROUTER_1_1], }, MED_1_2: { 'mode': 'rs', 'version': '1.2', - 'whitelist': [ROUTER_1_1, ROUTER_1_2], + 'allowlist': [ROUTER_1_1, ROUTER_1_2], }, } """All nodes are created with default configurations""" diff --git a/tests/toranj/README.md b/tests/toranj/README.md index 4a3351944..265cc7f69 100644 --- a/tests/toranj/README.md +++ b/tests/toranj/README.md @@ -164,11 +164,11 @@ Method `join_node()` can be used by a node to join another node: node1.join_node(node2, node_type=JOIN_TYPE_ROUTER) ``` -Method `whitelist_node()` can be used to add a given node to the whitelist of the device and enables white-listing: +Method `allowlist_node()` can be used to add a given node to the allowlist of the device and enables allowlisting: ```python - # `node2` is added to the whitelist of `node1` and white-listing is enabled on `node1` - node1.whitelist_node(node2) + # `node2` is added to the allowlist of `node1` and allowlisting is enabled on `node1` + node1.allowlist_node(node2) ``` #### Example (simple 3-node topology) @@ -186,14 +186,14 @@ Script below shows how to create a 3-node network topology with `node1` and `nod >>> node1.form("test-PAN") 'Forming WPAN "test-PAN" as node type "router"\nSuccessfully formed!' ->>> node1.whitelist_node(node2) ->>> node2.whitelist_node(node1) +>>> node1.allowlist_node(node2) +>>> node2.allowlist_node(node1) >>> node2.join_node(node1, wpan.JOIN_TYPE_ROUTER) 'Joining "test-PAN" C474513CB487778D as node type "router"\nSuccessfully Joined!' ->>> node3.whitelist_node(node2) ->>> node2.whitelist_node(node3) +>>> node3.allowlist_node(node2) +>>> node2.allowlist_node(node3) >>> node3.join_node(node2, wpan.JOIN_TYPE_END_DEVICE) 'Joining "test-PAN" C474513CB487778D as node type "end-device"\nSuccessfully Joined!' diff --git a/tests/toranj/test-001-get-set.py b/tests/toranj/test-001-get-set.py index cdc7b8082..5a26499ba 100644 --- a/tests/toranj/test-001-get-set.py +++ b/tests/toranj/test-001-get-set.py @@ -69,14 +69,14 @@ verify(node.get(wpan.WPAN_XPANID) == '0x1020031510006016') node.set(wpan.WPAN_KEY, '0123456789abcdeffecdba9876543210', binary_data=True) verify(node.get(wpan.WPAN_KEY) == '[0123456789ABCDEFFECDBA9876543210]') -node.set(wpan.WPAN_MAC_WHITELIST_ENABLED, '1') -verify(node.get(wpan.WPAN_MAC_WHITELIST_ENABLED) == 'true') +node.set(wpan.WPAN_MAC_ALLOWLIST_ENABLED, '1') +verify(node.get(wpan.WPAN_MAC_ALLOWLIST_ENABLED) == 'true') -node.set(wpan.WPAN_MAC_WHITELIST_ENABLED, '0') -verify(node.get(wpan.WPAN_MAC_WHITELIST_ENABLED) == 'false') +node.set(wpan.WPAN_MAC_ALLOWLIST_ENABLED, '0') +verify(node.get(wpan.WPAN_MAC_ALLOWLIST_ENABLED) == 'false') -node.set(wpan.WPAN_MAC_WHITELIST_ENABLED, 'true') -verify(node.get(wpan.WPAN_MAC_WHITELIST_ENABLED) == 'true') +node.set(wpan.WPAN_MAC_ALLOWLIST_ENABLED, 'true') +verify(node.get(wpan.WPAN_MAC_ALLOWLIST_ENABLED) == 'true') node.set(wpan.WPAN_THREAD_ROUTER_UPGRADE_THRESHOLD, '100') verify(int(node.get(wpan.WPAN_THREAD_ROUTER_UPGRADE_THRESHOLD), 0) == 100) @@ -141,12 +141,12 @@ all_gettable_props = [ wpan.WPAN_OT_MSG_BUFFER_COUNTERS_AS_STRING, wpan.WPAN_NCP_COUNTER_ALL_MAC, wpan.WPAN_NCP_COUNTER_ALL_MAC_ASVALMAP, - wpan.WPAN_MAC_WHITELIST_ENABLED, - wpan.WPAN_MAC_WHITELIST_ENTRIES, - wpan.WPAN_MAC_WHITELIST_ENTRIES_ASVALMAP, - wpan.WPAN_MAC_BLACKLIST_ENABLED, - wpan.WPAN_MAC_BLACKLIST_ENTRIES, - wpan.WPAN_MAC_BLACKLIST_ENTRIES_ASVALMAP, + wpan.WPAN_MAC_ALLOWLIST_ENABLED, + wpan.WPAN_MAC_ALLOWLIST_ENTRIES, + wpan.WPAN_MAC_ALLOWLIST_ENTRIES_ASVALMAP, + wpan.WPAN_MAC_DENYLIST_ENABLED, + wpan.WPAN_MAC_DENYLIST_ENTRIES, + wpan.WPAN_MAC_DENYLIST_ENTRIES_ASVALMAP, wpan.WPAN_JAM_DETECTION_STATUS, wpan.WPAN_JAM_DETECTION_ENABLE, wpan.WPAN_JAM_DETECTION_RSSI_THRESHOLD, diff --git a/tests/toranj/test-010-on-mesh-prefix-config-gateway.py b/tests/toranj/test-010-on-mesh-prefix-config-gateway.py index b9d117c18..ef2890e23 100644 --- a/tests/toranj/test-010-on-mesh-prefix-config-gateway.py +++ b/tests/toranj/test-010-on-mesh-prefix-config-gateway.py @@ -112,11 +112,11 @@ wpan.Node.init_all_nodes() # ----------------------------------------------------------------------------------------------------------------------- # Build network topology -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) -r1.whitelist_node(sc1) -r2.whitelist_node(sc2) +r1.allowlist_node(sc1) +r2.allowlist_node(sc2) r1.form('config-gtway') r2.join_node(r1, node_type=wpan.JOIN_TYPE_ROUTER) diff --git a/tests/toranj/test-012-multi-hop-traffic.py b/tests/toranj/test-012-multi-hop-traffic.py index 45e18dff7..3bdd2936b 100644 --- a/tests/toranj/test-012-multi-hop-traffic.py +++ b/tests/toranj/test-012-multi-hop-traffic.py @@ -88,25 +88,25 @@ wpan.Node.init_all_nodes() # / \ | | / \ # fed1 sed1 sed2 sed3 sed4 fed4 -# Whitelist routers with their corresponding sleepy children +# Allowlist routers with their corresponding sleepy children for index in range(0, NUM_ROUTERS): - routers[index].whitelist_node(sed_children[index]) - sed_children[index].whitelist_node(routers[index]) + routers[index].allowlist_node(sed_children[index]) + sed_children[index].allowlist_node(routers[index]) -# Whitelist a FED child for the first and last routers +# Allowlist a FED child for the first and last routers -routers[0].whitelist_node(fed_children[0]) -fed_children[0].whitelist_node(routers[0]) +routers[0].allowlist_node(fed_children[0]) +fed_children[0].allowlist_node(routers[0]) -routers[-1].whitelist_node(fed_children[-1]) -fed_children[-1].whitelist_node(routers[-1]) +routers[-1].allowlist_node(fed_children[-1]) +fed_children[-1].allowlist_node(routers[-1]) # While list routers at [index-1] and [index] for index in range(1, NUM_ROUTERS): - routers[index - 1].whitelist_node(routers[index]) - routers[index].whitelist_node(routers[index - 1]) + routers[index - 1].allowlist_node(routers[index]) + routers[index].allowlist_node(routers[index - 1]) routers[0].form("multi-hop") sed_children[0].join_node(routers[0], wpan.JOIN_TYPE_SLEEPY_END_DEVICE) diff --git a/tests/toranj/test-013-off-mesh-route-traffic.py b/tests/toranj/test-013-off-mesh-route-traffic.py index 63668c01b..7f313b5e6 100644 --- a/tests/toranj/test-013-off-mesh-route-traffic.py +++ b/tests/toranj/test-013-off-mesh-route-traffic.py @@ -87,14 +87,14 @@ for node in all_nodes: # | | # fed1 sed2 -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) -r1.whitelist_node(fed1) -fed1.whitelist_node(r1) +r1.allowlist_node(fed1) +fed1.allowlist_node(r1) -r2.whitelist_node(sed2) -sed2.whitelist_node(r2) +r2.allowlist_node(sed2) +sed2.allowlist_node(r2) r1.form("off-mesh") r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) diff --git a/tests/toranj/test-014-ip6-address-add.py b/tests/toranj/test-014-ip6-address-add.py index a7f694c81..2bac6feb3 100644 --- a/tests/toranj/test-014-ip6-address-add.py +++ b/tests/toranj/test-014-ip6-address-add.py @@ -82,14 +82,14 @@ wpan.Node.init_all_nodes() # | | # fed1 sed2 -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) -r1.whitelist_node(fed1) -fed1.whitelist_node(r1) +r1.allowlist_node(fed1) +fed1.allowlist_node(r1) -r2.whitelist_node(sed2) -sed2.whitelist_node(r2) +r2.allowlist_node(sed2) +sed2.allowlist_node(r2) r1.form("ip-addr") r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) diff --git a/tests/toranj/test-015-same-prefix-on-multiple-nodes.py b/tests/toranj/test-015-same-prefix-on-multiple-nodes.py index 7fd8ba6a5..5c605f50d 100644 --- a/tests/toranj/test-015-same-prefix-on-multiple-nodes.py +++ b/tests/toranj/test-015-same-prefix-on-multiple-nodes.py @@ -60,11 +60,11 @@ wpan.Node.init_all_nodes() # Two routers r1 and r2 (sed2 is used for quick promotion of r2 to router # status). -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) -r2.whitelist_node(sed2) -sed2.whitelist_node(r2) +r2.allowlist_node(sed2) +sed2.allowlist_node(r2) r1.form("same-prefix") diff --git a/tests/toranj/test-016-neighbor-table.py b/tests/toranj/test-016-neighbor-table.py index 294fcd984..174fb7625 100644 --- a/tests/toranj/test-016-neighbor-table.py +++ b/tests/toranj/test-016-neighbor-table.py @@ -74,21 +74,21 @@ wpan.Node.init_all_nodes() # Build network topology # -# whitelist all routers with one another +# allowlist all routers with one another for i in range(NUM_ROUTERS): for j in range(NUM_ROUTERS): if i != j: - routers[i].whitelist_node(routers[j]) + routers[i].allowlist_node(routers[j]) # All children should attach to routers[0] for num in range(NUM_CHILDREN): - children[num].whitelist_node(routers[0]) - routers[0].whitelist_node(children[num]) + children[num].allowlist_node(routers[0]) + routers[0].allowlist_node(children[num]) -# whitelist the end-device ed with its corresponding router +# allowlist the end-device ed with its corresponding router for num in range(1, NUM_ROUTERS): - ed[num].whitelist_node(routers[num]) - routers[num].whitelist_node(ed[num]) + ed[num].allowlist_node(routers[num]) + routers[num].allowlist_node(ed[num]) routers[0].form("neigh-table") diff --git a/tests/toranj/test-018-child-supervision.py b/tests/toranj/test-018-child-supervision.py index 9e8f59a29..b73f3acd5 100644 --- a/tests/toranj/test-018-child-supervision.py +++ b/tests/toranj/test-018-child-supervision.py @@ -35,7 +35,7 @@ from wpan import verify # # This test covers the behavior of Child Supervision feature. # -# This test uses MAC whitelisting to emulate the situation where a child is +# This test uses MAC allowlisting to emulate the situation where a child is # removed from parent's child table while the child continues to stay attached # to the parent (since data polls from child are acked at radio platform layer). # Specifically the test verifies that once supervision check is enabled on the @@ -98,15 +98,15 @@ child_table = wpan.parse_child_table_result(parent.get(wpan.WPAN_THREAD_CHILD_TA verify(len(child_table) == 1) verify(int(child_table[0].timeout, 0) == CHILD_TIMEOUT) -# Enabling white-listing on parent +# Enabling allowlisting on parent # -# Since child is not in parent's whitelist, the data polls from child +# Since child is not in parent's allowlist, the data polls from child # should be rejected and the child should be removed from parent's # child table after timeout. The child however should continue to # stay attached (since data polls are acked by radio driver) and # supervision check is disabled on the child. -parent.set(wpan.WPAN_MAC_WHITELIST_ENABLED, '1') +parent.set(wpan.WPAN_MAC_ALLOWLIST_ENABLED, '1') def check_child_is_removed_from_parent_child_table(): @@ -136,10 +136,10 @@ wpan.verify_within(check_child_is_detached, CHILD_SUPERVISION_CHECK_TIMEOUT / sp # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Enable child supervision on parent and disable white-listing +# Enable child supervision on parent and disable allowlisting parent.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) -parent.set(wpan.WPAN_MAC_WHITELIST_ENABLED, '0') +parent.set(wpan.WPAN_MAC_ALLOWLIST_ENABLED, '0') # Wait for the child to attach back diff --git a/tests/toranj/test-019-inform-previous-parent.py b/tests/toranj/test-019-inform-previous-parent.py index adeefce89..5b81f4d09 100644 --- a/tests/toranj/test-019-inform-previous-parent.py +++ b/tests/toranj/test-019-inform-previous-parent.py @@ -88,9 +88,9 @@ wpan.Node.init_all_nodes() # child # -parent1.whitelist_node(parent2) -parent2.whitelist_node(parent1) -parent2.whitelist_node(child) +parent1.allowlist_node(parent2) +parent2.allowlist_node(parent1) +parent2.allowlist_node(child) parent1.form("inform-parent") parent2.join_node(parent1, wpan.JOIN_TYPE_ROUTER) @@ -108,10 +108,10 @@ PARENT_SUPERVISION_INTERVAL = 1 child_table = wpan.parse_list(parent2.get(wpan.WPAN_THREAD_CHILD_TABLE)) verify(len(child_table) == 1) -# Remove the `child` from whitelist of `parent2` and add it to whitelist +# Remove the `child` from allowlist of `parent2` and add it to allowlist # of `parent1` instead. -parent1.whitelist_node(child) -parent2.un_whitelist_node(child) +parent1.allowlist_node(child) +parent2.un_allowlist_node(child) # Enable supervision check on the `child` and also on `parent1`. @@ -122,10 +122,10 @@ child.set( parent1.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) # Since child supervision is not enabled on `parent2` and the `child` is -# removed from whitelist on `parent2`, after the supervision check timeout +# removed from allowlist on `parent2`, after the supervision check timeout # the `child` should realize that it can no longer talk to its current # parent (`parent2`) and try to reattach. All re-attach attempts to `parent2` -# should fail (due to whitelist) and cause the `child` to get detached and +# should fail (due to allowlist) and cause the `child` to get detached and # search for a new parent and then attach to `parent1`. # # To verify that the `child` does get detached and attach to a new parent, we diff --git a/tests/toranj/test-020-router-table.py b/tests/toranj/test-020-router-table.py index 107ea8d04..81474afdc 100644 --- a/tests/toranj/test-020-router-table.py +++ b/tests/toranj/test-020-router-table.py @@ -71,24 +71,24 @@ wpan.Node.init_all_nodes() r1.form("route-table") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -r2.whitelist_node(r3) -r3.whitelist_node(r2) +r2.allowlist_node(r3) +r3.allowlist_node(r2) r3.join_node(r2, wpan.JOIN_TYPE_ROUTER) -r3.whitelist_node(r1) -r1.whitelist_node(r3) +r3.allowlist_node(r1) +r1.allowlist_node(r3) -r3.whitelist_node(r4) -r4.whitelist_node(r3) +r3.allowlist_node(r4) +r4.allowlist_node(r3) r4.join_node(r3, wpan.JOIN_TYPE_ROUTER) # c4 is attached to r4 so that it quickly gets promoted to a router role. -c4.whitelist_node(r4) -r4.whitelist_node(c4) +c4.allowlist_node(r4) +r4.allowlist_node(c4) c4.join_node(r4, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) c4.set(wpan.WPAN_POLL_INTERVAL, '2000') diff --git a/tests/toranj/test-021-address-cache-table.py b/tests/toranj/test-021-address-cache-table.py index 85dc6fe20..e2b61c7ab 100644 --- a/tests/toranj/test-021-address-cache-table.py +++ b/tests/toranj/test-021-address-cache-table.py @@ -80,25 +80,25 @@ r1.form("addr-cache-tbl") r1.add_prefix(PREFIX, stable=True, on_mesh=True, slaac=True, preferred=True) -r1.whitelist_node(c1) -c1.whitelist_node(r1) +r1.allowlist_node(c1) +c1.allowlist_node(r1) c1.join_node(r1, wpan.JOIN_TYPE_END_DEVICE) -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) c2.set(wpan.WPAN_POLL_INTERVAL, str(POLL_INTERVAL)) -r2.whitelist_node(r3) -r3.whitelist_node(r2) +r2.allowlist_node(r3) +r3.allowlist_node(r2) r3.join_node(r2, wpan.JOIN_TYPE_ROUTER) -c3.whitelist_node(r3) -r3.whitelist_node(c3) +c3.allowlist_node(r3) +r3.allowlist_node(c3) c3.join_node(r3, wpan.JOIN_TYPE_END_DEVICE) # ----------------------------------------------------------------------------------------------------------------------- @@ -183,9 +183,9 @@ c2.set( ) r3.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) -r2.un_whitelist_node(c2) -r3.whitelist_node(c2) -c2.whitelist_node(r3) +r2.un_allowlist_node(c2) +r3.allowlist_node(c2) +c2.allowlist_node(r3) # Wait for c2 to detach from r2 and attach to r3. # @@ -266,9 +266,9 @@ c2.set( ) r2.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) -r3.un_whitelist_node(c2) -r2.whitelist_node(c2) -c2.whitelist_node(r2) +r3.un_allowlist_node(c2) +r2.allowlist_node(c2) +c2.allowlist_node(r2) # Wait for c2 to detach from r3 and attach to r2. # @@ -334,9 +334,9 @@ c2.set( ) r3.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) -r2.un_whitelist_node(c2) -r3.whitelist_node(c2) -c2.whitelist_node(r3) +r2.un_allowlist_node(c2) +r3.allowlist_node(c2) +c2.allowlist_node(r3) # Wait for c2 to detach from r2 and attach to r3. # diff --git a/tests/toranj/test-023-multicast-traffic.py b/tests/toranj/test-023-multicast-traffic.py index 319075fc4..0ba34158d 100644 --- a/tests/toranj/test-023-multicast-traffic.py +++ b/tests/toranj/test-023-multicast-traffic.py @@ -124,24 +124,24 @@ wpan.Node.init_all_nodes() r1.form("mcast-traffic") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -r2.whitelist_node(fed) -fed.whitelist_node(r2) +r2.allowlist_node(fed) +fed.allowlist_node(r2) fed.join_node(r2, wpan.JOIN_TYPE_END_DEVICE) -r2.whitelist_node(r3) -r3.whitelist_node(r2) +r2.allowlist_node(r3) +r3.allowlist_node(r2) r3.join_node(r2, wpan.JOIN_TYPE_ROUTER) -r3.whitelist_node(r4) -r4.whitelist_node(r3) +r3.allowlist_node(r4) +r4.allowlist_node(r3) r4.join_node(r3, wpan.JOIN_TYPE_ROUTER) -r4.whitelist_node(sed) -sed.whitelist_node(r4) +r4.allowlist_node(sed) +sed.allowlist_node(r4) sed.join_node(r4, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) sed.set(wpan.WPAN_POLL_INTERVAL, '600') diff --git a/tests/toranj/test-024-partition-merge.py b/tests/toranj/test-024-partition-merge.py index 28c36aeca..cb761f0ab 100644 --- a/tests/toranj/test-024-partition-merge.py +++ b/tests/toranj/test-024-partition-merge.py @@ -113,16 +113,16 @@ wpan.Node.init_all_nodes() r1.form("partition") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c1.whitelist_node(r1) -r1.whitelist_node(c1) +c1.allowlist_node(r1) +r1.allowlist_node(c1) c1.join_node(r1, wpan.JOIN_TYPE_END_DEVICE) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, wpan.JOIN_TYPE_END_DEVICE) # ----------------------------------------------------------------------------------------------------------------------- @@ -140,9 +140,9 @@ verify(r1.get(wpan.WPAN_NODE_TYPE) == wpan.NODE_TYPE_LEADER) verify(r2.get(wpan.WPAN_NODE_TYPE) == wpan.NODE_TYPE_ROUTER) # Now force the two routers to form their own partition -# by removing them from each other's whitelist table -r1.un_whitelist_node(r2) -r2.un_whitelist_node(r1) +# by removing them from each other's allowlist table +r1.un_allowlist_node(r2) +r2.un_allowlist_node(r1) # Add a prefix before r2 realizes it can not longer talk # to leader (r1). @@ -160,9 +160,9 @@ wpan.verify_within(check_r2_become_leader, long_wait) # While we have two partition, add a prefix on r1 r1.add_prefix(prefix1) -# Update white list and wait for partitions to merge. -r1.whitelist_node(r2) -r2.whitelist_node(r1) +# Update allowlist and wait for partitions to merge. +r1.allowlist_node(r2) +r2.allowlist_node(r1) def check_partition_id_match(): diff --git a/tests/toranj/test-025-network-data-timeout.py b/tests/toranj/test-025-network-data-timeout.py index a644cb783..1d1482f35 100644 --- a/tests/toranj/test-025-network-data-timeout.py +++ b/tests/toranj/test-025-network-data-timeout.py @@ -129,12 +129,12 @@ wpan.Node.init_all_nodes() r1.form("net-data") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -r2.whitelist_node(c2) -c2.whitelist_node(r2) +r2.allowlist_node(c2) +c2.allowlist_node(r2) c2.join_node(r2, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) c2.set(wpan.WPAN_POLL_INTERVAL, '400') diff --git a/tests/toranj/test-026-slaac-address-wpantund.py b/tests/toranj/test-026-slaac-address-wpantund.py index fd2ae5d68..f0f0efd7e 100644 --- a/tests/toranj/test-026-slaac-address-wpantund.py +++ b/tests/toranj/test-026-slaac-address-wpantund.py @@ -122,13 +122,13 @@ wpan.Node.init_all_nodes() r1.form('slaac-test') -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, node_type=wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, node_type=wpan.JOIN_TYPE_END_DEVICE) diff --git a/tests/toranj/test-028-router-leader-reset-recovery.py b/tests/toranj/test-028-router-leader-reset-recovery.py index 9495ae1d9..f119a9a50 100644 --- a/tests/toranj/test-028-router-leader-reset-recovery.py +++ b/tests/toranj/test-028-router-leader-reset-recovery.py @@ -77,12 +77,12 @@ wpan.Node.init_all_nodes() r1.form("RtrLderRst") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, wpan.JOIN_TYPE_END_DEVICE) c2.set(wpan.WPAN_POLL_INTERVAL, '8000') diff --git a/tests/toranj/test-030-slaac-address-ncp.py b/tests/toranj/test-030-slaac-address-ncp.py index 450125d8d..cbcc5e20c 100644 --- a/tests/toranj/test-030-slaac-address-ncp.py +++ b/tests/toranj/test-030-slaac-address-ncp.py @@ -130,13 +130,13 @@ wpan.Node.init_all_nodes() r1.form('slaac-ncp') -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, node_type=wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, node_type=wpan.JOIN_TYPE_END_DEVICE) diff --git a/tests/toranj/test-032-child-attach-with-multiple-ip-addresses.py b/tests/toranj/test-032-child-attach-with-multiple-ip-addresses.py index c93bf0c39..08c4f5733 100644 --- a/tests/toranj/test-032-child-attach-with-multiple-ip-addresses.py +++ b/tests/toranj/test-032-child-attach-with-multiple-ip-addresses.py @@ -81,12 +81,12 @@ wpan.Node.init_all_nodes() leader.form('multi-addr-test') -leader.whitelist_node(parent) -parent.whitelist_node(leader) +leader.allowlist_node(parent) +parent.allowlist_node(leader) parent.join_node(leader, wpan.JOIN_TYPE_ROUTER) -parent.whitelist_node(child) -child.whitelist_node(parent) +parent.allowlist_node(child) +child.allowlist_node(parent) child.join_node(parent, node_type=wpan.JOIN_TYPE_SLEEPY_END_DEVICE) child.set(wpan.WPAN_POLL_INTERVAL, '400') @@ -120,8 +120,8 @@ def check_addresses_on_child(): wpan.verify_within(check_addresses_on_child, WAIT_TIME) -# Remove child from parent's white-list -parent.remove(wpan.WPAN_MAC_WHITELIST_ENTRIES, child.get(wpan.WPAN_EXT_ADDRESS)[1:-1]) +# Remove child from parent's allowlist +parent.remove(wpan.WPAN_MAC_ALLOWLIST_ENTRIES, child.get(wpan.WPAN_EXT_ADDRESS)[1:-1]) # Enable supervision check on child, this ensures that child is detached soon. child.set( diff --git a/tests/toranj/test-036-wpantund-host-route-management.py b/tests/toranj/test-036-wpantund-host-route-management.py index 0a62641cc..a9f846b08 100644 --- a/tests/toranj/test-036-wpantund-host-route-management.py +++ b/tests/toranj/test-036-wpantund-host-route-management.py @@ -99,20 +99,20 @@ wpan.Node.init_all_nodes() r1.form("route-test") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -r3.whitelist_node(r2) -r2.whitelist_node(r3) +r3.allowlist_node(r2) +r2.allowlist_node(r3) r3.join_node(r2, wpan.JOIN_TYPE_ROUTER) -c3.whitelist_node(r3) -r3.whitelist_node(c3) +c3.allowlist_node(r3) +r3.allowlist_node(c3) c3.join_node(r3, wpan.JOIN_TYPE_END_DEVICE) -r3.whitelist_node(r1) -r1.whitelist_node(r3) +r3.allowlist_node(r1) +r1.allowlist_node(r3) # ----------------------------------------------------------------------------------------------------------------------- # Test implementation diff --git a/tests/toranj/test-037-wpantund-auto-add-route-for-on-mesh-prefix.py b/tests/toranj/test-037-wpantund-auto-add-route-for-on-mesh-prefix.py index f16e1f255..27456e778 100644 --- a/tests/toranj/test-037-wpantund-auto-add-route-for-on-mesh-prefix.py +++ b/tests/toranj/test-037-wpantund-auto-add-route-for-on-mesh-prefix.py @@ -85,12 +85,12 @@ wpan.Node.init_all_nodes() r1.form("prefix-route") -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, wpan.JOIN_TYPE_END_DEVICE) # ----------------------------------------------------------------------------------------------------------------------- diff --git a/tests/toranj/test-038-clear-address-cache-for-sed.py b/tests/toranj/test-038-clear-address-cache-for-sed.py index f7114e750..aebcbaada 100644 --- a/tests/toranj/test-038-clear-address-cache-for-sed.py +++ b/tests/toranj/test-038-clear-address-cache-for-sed.py @@ -75,21 +75,21 @@ r1.form("addr-cache") r1.add_prefix(PREFIX, stable=True, on_mesh=True, slaac=True, preferred=True) -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) c.set(wpan.WPAN_POLL_INTERVAL, str(POLL_INTERVAL)) -c.whitelist_node(r2) -r2.whitelist_node(c) +c.allowlist_node(r2) +r2.allowlist_node(c) c.join_node(r2, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) -r3.whitelist_node(r1) -r1.whitelist_node(r3) +r3.allowlist_node(r1) +r1.allowlist_node(r3) r3.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c3.whitelist_node(r3) -r3.whitelist_node(c3) +c3.allowlist_node(r3) +r3.allowlist_node(c3) c3.join_node(r3, wpan.JOIN_TYPE_END_DEVICE) # ----------------------------------------------------------------------------------------------------------------------- @@ -136,9 +136,9 @@ r2.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) r1.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) r3.set(wpan.WPAN_CHILD_SUPERVISION_INTERVAL, str(PARENT_SUPERVISION_INTERVAL)) -r2.un_whitelist_node(c) -r1.whitelist_node(c) -c.whitelist_node(r1) +r2.un_allowlist_node(c) +r1.allowlist_node(c) +c.allowlist_node(r1) # Wait for c to detach from r2 and attach to r1. @@ -170,9 +170,9 @@ verify(sender.was_successful and recver.was_successful) # | \ # c3 c -r1.un_whitelist_node(c) -r3.whitelist_node(c) -c.whitelist_node(r3) +r1.un_allowlist_node(c) +r3.allowlist_node(c) +c.allowlist_node(r3) # Wait for c to detach from r1 and attach to r3. diff --git a/tests/toranj/test-039-address-cache-table-snoop.py b/tests/toranj/test-039-address-cache-table-snoop.py index 96a02d7c3..66ec2bacc 100644 --- a/tests/toranj/test-039-address-cache-table-snoop.py +++ b/tests/toranj/test-039-address-cache-table-snoop.py @@ -79,20 +79,20 @@ r1.form("sekiro") # shadows die twice! r1.add_prefix(PREFIX, stable=True, on_mesh=True, slaac=False, preferred=True) -r1.whitelist_node(r2) -r2.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c2.whitelist_node(r2) -r2.whitelist_node(c2) +c2.allowlist_node(r2) +r2.allowlist_node(c2) c2.join_node(r2, wpan.JOIN_TYPE_END_DEVICE) -r1.whitelist_node(r3) -r3.whitelist_node(r1) +r1.allowlist_node(r3) +r3.allowlist_node(r1) r3.join_node(r1, wpan.JOIN_TYPE_ROUTER) -c3.whitelist_node(r3) -r3.whitelist_node(c3) +c3.allowlist_node(r3) +r3.allowlist_node(c3) c3.join_node(r3, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) c3.set(wpan.WPAN_POLL_INTERVAL, str(POLL_INTERVAL)) diff --git a/tests/toranj/test-601-channel-manager-channel-change.py b/tests/toranj/test-601-channel-manager-channel-change.py index 156386061..db3965332 100644 --- a/tests/toranj/test-601-channel-manager-channel-change.py +++ b/tests/toranj/test-601-channel-manager-channel-change.py @@ -80,15 +80,15 @@ wpan.Node.init_all_nodes() for node in all_nodes: node.set(wpan.WPAN_OT_LOG_LEVEL, '0') -r1.whitelist_node(r2) -r2.whitelist_node(r1) -r1.whitelist_node(r3) -r3.whitelist_node(r1) +r1.allowlist_node(r2) +r2.allowlist_node(r1) +r1.allowlist_node(r3) +r3.allowlist_node(r1) -r1.whitelist_node(sc1) -r1.whitelist_node(ec1) -r2.whitelist_node(sc2) -r3.whitelist_node(sc3) +r1.allowlist_node(sc1) +r1.allowlist_node(ec1) +r2.allowlist_node(sc2) +r3.allowlist_node(sc3) r1.form('channel-manager', channel=12) r2.join_node(r1, node_type=wpan.JOIN_TYPE_ROUTER) diff --git a/tests/toranj/wpan.py b/tests/toranj/wpan.py index 3ade34a99..e59a0b709 100644 --- a/tests/toranj/wpan.py +++ b/tests/toranj/wpan.py @@ -123,12 +123,12 @@ WPAN_OT_MSG_BUFFER_COUNTERS_AS_STRING = "OpenThread:MsgBufferCounters:AsString" WPAN_OT_DEBUG_TEST_ASSERT = "OpenThread:Debug:TestAssert" WPAN_OT_DEBUG_TEST_WATCHDOG = "OpenThread:Debug:TestWatchdog" -WPAN_MAC_WHITELIST_ENABLED = "MAC:Whitelist:Enabled" -WPAN_MAC_WHITELIST_ENTRIES = "MAC:Whitelist:Entries" -WPAN_MAC_WHITELIST_ENTRIES_ASVALMAP = "MAC:Whitelist:Entries:AsValMap" -WPAN_MAC_BLACKLIST_ENABLED = "MAC:Blacklist:Enabled" -WPAN_MAC_BLACKLIST_ENTRIES = "MAC:Blacklist:Entries" -WPAN_MAC_BLACKLIST_ENTRIES_ASVALMAP = "MAC:Blacklist:Entries:AsValMap" +WPAN_MAC_ALLOWLIST_ENABLED = "MAC:Allowlist:Enabled" +WPAN_MAC_ALLOWLIST_ENTRIES = "MAC:Allowlist:Entries" +WPAN_MAC_ALLOWLIST_ENTRIES_ASVALMAP = "MAC:Allowlist:Entries:AsValMap" +WPAN_MAC_DENYLIST_ENABLED = "MAC:Denylist:Enabled" +WPAN_MAC_DENYLIST_ENTRIES = "MAC:Denylist:Entries" +WPAN_MAC_DENYLIST_ENTRIES_ASVALMAP = "MAC:Denylist:Entries:AsValMap" WPAN_MAC_FILTER_FIXED_RSSI = "MAC:Filter:FixedRssi" WPAN_MAC_FILTER_ENTRIES = "MAC:Filter:Entries" @@ -560,15 +560,15 @@ class Node(object): xpanid=node.get(WPAN_XPANID), key=node.get(WPAN_KEY)[1:-1] if should_set_key else None) - def whitelist_node(self, node): - """Adds a given node (of type `Node`) to the whitelist of `self` and enables whitelisting on `self`""" + def allowlist_node(self, node): + """Adds a given node (of type `Node`) to the allowlist of `self` and enables allowlisting on `self`""" - self.add(WPAN_MAC_WHITELIST_ENTRIES, node.get(WPAN_EXT_ADDRESS)[1:-1]) - self.set(WPAN_MAC_WHITELIST_ENABLED, '1') + self.add(WPAN_MAC_ALLOWLIST_ENTRIES, node.get(WPAN_EXT_ADDRESS)[1:-1]) + self.set(WPAN_MAC_ALLOWLIST_ENABLED, '1') - def un_whitelist_node(self, node): - """Removes a given node (of node `Node) from the whitelist""" - self.remove(WPAN_MAC_WHITELIST_ENTRIES, node.get(WPAN_EXT_ADDRESS)[1:-1]) + def un_allowlist_node(self, node): + """Removes a given node (of node `Node) from the allowlist""" + self.remove(WPAN_MAC_ALLOWLIST_ENTRIES, node.get(WPAN_EXT_ADDRESS)[1:-1]) def is_in_scan_result(self, scan_result): """Checks if node is in the scan results diff --git a/tools/harness-automation/README.rst b/tools/harness-automation/README.rst index 857d341c9..79cef14ba 100644 --- a/tools/harness-automation/README.rst +++ b/tools/harness-automation/README.rst @@ -16,7 +16,7 @@ Syntax :: - ./start.sh [-h] [--pattern PATTERN] [--delete-blacklist] [--skip SKIP] + ./start.sh [-h] [--pattern PATTERN] [--delete-denylist] [--skip SKIP] [--dry-run] [--result-file RESULT_FILE] [--list-file LIST_FILE] [--continue-from CONTINUE_FROM] [--auto-reboot] [--manual-reset] [--list-devices] @@ -24,4 +24,4 @@ Syntax If ``-l`` is given, ``NAME`` is the serial port device name. Otherwise ``NAME`` is test case name. This enables running single or multiple test cases directly. -Use ``./start.sh --help`` for a full list of options. \ No newline at end of file +Use ``./start.sh --help`` for a full list of options. diff --git a/tools/harness-automation/autothreadharness/helpers.py b/tools/harness-automation/autothreadharness/helpers.py index e8834a127..9d20b5676 100644 --- a/tools/harness-automation/autothreadharness/helpers.py +++ b/tools/harness-automation/autothreadharness/helpers.py @@ -40,7 +40,7 @@ class HistoryHelper(object): self.data = json.load(open(filename, 'r')) except Exception: self.logger.exception('file may not exists') - self.data = {'golden_device_black_list': []} + self.data = {'golden_device_denylist': []} self.save() def save(self): @@ -48,11 +48,11 @@ class HistoryHelper(object): def mark_bad_golden_device(self, port): self.logger.warning('mark serial port[%s] as bad', port) - self.data['golden_device_black_list'].append(port) + self.data['golden_device_denylist'].append(port) self.save() def is_bad_golden_device(self, port): - return port in self.data['golden_device_black_list'] + return port in self.data['golden_device_denylist'] def __str__(self): return json.dumps(self.data, indent=2) diff --git a/tools/harness-automation/autothreadharness/open_thread_controller.py b/tools/harness-automation/autothreadharness/open_thread_controller.py index 1c3365e3b..e99f2fd21 100644 --- a/tools/harness-automation/autothreadharness/open_thread_controller.py +++ b/tools/harness-automation/autothreadharness/open_thread_controller.py @@ -377,10 +377,10 @@ class OpenThreadController(threading.Thread): time.sleep(1) self._req('netdataregister') - def enable_blacklist(self): - """Enable blacklist feature""" - self._req('blacklist enable') + def enable_denylist(self): + """Enable denylist feature""" + self._req('denylist enable') - def add_blacklist(self, mac): - """Add a mac address to blacklist""" - self._req('blacklist add %s' % mac) + def add_denylist(self, mac): + """Add a mac address to denylist""" + self._req('denylist add %s' % mac) diff --git a/tools/harness-automation/autothreadharness/runner.py b/tools/harness-automation/autothreadharness/runner.py index 6dcf5b14f..a6010253d 100644 --- a/tools/harness-automation/autothreadharness/runner.py +++ b/tools/harness-automation/autothreadharness/runner.py @@ -178,7 +178,7 @@ def discover( pattern=['*.py'], skip='efp', dry_run=False, - blacklist=None, + denylist=None, name_greps=None, manual_reset=False, delete_history=False, @@ -202,11 +202,11 @@ def discover( if delete_history: os.system('del history.json') - if blacklist: + if denylist: try: - excludes = [line.strip('\n') for line in open(blacklist, 'r').readlines() if not line.startswith('#')] + excludes = [line.strip('\n') for line in open(denylist, 'r').readlines() if not line.startswith('#')] except BaseException: - logger.exception('Failed to open test case black list file') + logger.exception('Failed to open test case denylist file') raise else: excludes = [] @@ -257,7 +257,7 @@ def discover( logger.info('case[%s] skipped by name greps', case_name) continue - # whitelist + # allowlist if len(names) and case_name not in names: logger.info('case[%s] skipped', case_name) continue @@ -278,9 +278,9 @@ def discover( else: continue_from = None - # black list + # denylist if case_name in excludes: - logger.warning('case[%s] skipped for blacklist', case_name) + logger.warning('case[%s] skipped for denylist', case_name) continue # max devices @@ -342,9 +342,9 @@ def main(): nargs='*', default=None, help='test case name, omit to test all') - parser.add_argument('--blacklist', + parser.add_argument('--denylist', '-b', - metavar='BLACKLIST_FILE', + metavar='DENYLIST_FILE', type=str, help='file to list test cases to skip', default=None) diff --git a/tools/harness-automation/cases/router_5_3_3.py b/tools/harness-automation/cases/router_5_3_3.py index 9c736f4e8..2e46ecd65 100644 --- a/tools/harness-automation/cases/router_5_3_3.py +++ b/tools/harness-automation/cases/router_5_3_3.py @@ -38,8 +38,8 @@ class Router_5_3_3(HarnessCase): def on_dialog(self, dialog, title): if title.startswith('Start DUT'): - self.dut.enable_blacklist() - self.dut.add_blacklist('166e0a000000005') + self.dut.enable_denylist() + self.dut.add_denylist('166e0a000000005') if __name__ == '__main__': diff --git a/tools/harness-automation/cases_R140/router_5_3_3.py b/tools/harness-automation/cases_R140/router_5_3_3.py index 9c736f4e8..2e46ecd65 100755 --- a/tools/harness-automation/cases_R140/router_5_3_3.py +++ b/tools/harness-automation/cases_R140/router_5_3_3.py @@ -38,8 +38,8 @@ class Router_5_3_3(HarnessCase): def on_dialog(self, dialog, title): if title.startswith('Start DUT'): - self.dut.enable_blacklist() - self.dut.add_blacklist('166e0a000000005') + self.dut.enable_denylist() + self.dut.add_denylist('166e0a000000005') if __name__ == '__main__': diff --git a/tools/harness-thci/OpenThread.py b/tools/harness-thci/OpenThread.py index ceeed6731..dae9001c8 100644 --- a/tools/harness-thci/OpenThread.py +++ b/tools/harness-thci/OpenThread.py @@ -442,15 +442,15 @@ class OpenThreadTHCI(object): else: self.hasActiveDatasetToCommit = False - # restore whitelist/blacklist address filter mode if rejoin after + # restore allowlist/denylist address filter mode if rejoin after # reset if self.isPowerDown: - if self._addressfilterMode == 'whitelist': - if self.__setAddressfilterMode('whitelist'): + if self._addressfilterMode == 'allowlist': + if self.__setAddressfilterMode('allowlist'): for addr in self._addressfilterSet: self.addAllowMAC(addr) - elif self._addressfilterMode == 'blacklist': - if self.__setAddressfilterMode('blacklist'): + elif self._addressfilterMode == 'denylist': + if self.__setAddressfilterMode('denylist'): for addr in self._addressfilterSet: self.addBlockedMAC(addr) @@ -898,14 +898,14 @@ class OpenThreadTHCI(object): @API def addBlockedMAC(self, xEUI): - """add a given extended address to the blacklist entry + """add a given extended address to the denylist entry Args: xEUI: extended address in hex format Returns: - True: successful to add a given extended address to the blacklist entry - False: fail to add a given extended address to the blacklist entry + True: successful to add a given extended address to the denylist entry + False: fail to add a given extended address to the denylist entry """ print('%s call addBlockedMAC' % self.port) print(xEUI) @@ -920,16 +920,16 @@ class OpenThreadTHCI(object): print('block device itself') return True - if self._addressfilterMode != 'blacklist': - if self.__setAddressfilterMode('blacklist'): - self._addressfilterMode = 'blacklist' + if self._addressfilterMode != 'denylist': + if self.__setAddressfilterMode('denylist'): + self._addressfilterMode = 'denylist' cmd = 'macfilter addr add %s' % macAddr print(cmd) ret = self.__executeCommand(cmd)[-1] == 'Done' self._addressfilterSet.add(macAddr) - print('current blacklist entries:') + print('current denylist entries:') for addr in self._addressfilterSet: print(addr) @@ -939,14 +939,14 @@ class OpenThreadTHCI(object): @API def addAllowMAC(self, xEUI): - """add a given extended address to the whitelist addressfilter + """add a given extended address to the allowlist addressfilter Args: xEUI: a given extended address in hex format Returns: - True: successful to add a given extended address to the whitelist entry - False: fail to add a given extended address to the whitelist entry + True: successful to add a given extended address to the allowlist entry + False: fail to add a given extended address to the allowlist entry """ print('%s call addAllowMAC' % self.port) print(xEUI) @@ -956,16 +956,16 @@ class OpenThreadTHCI(object): macAddr = self.__convertLongToHex(xEUI) try: - if self._addressfilterMode != 'whitelist': - if self.__setAddressfilterMode('whitelist'): - self._addressfilterMode = 'whitelist' + if self._addressfilterMode != 'allowlist': + if self.__setAddressfilterMode('allowlist'): + self._addressfilterMode = 'allowlist' cmd = 'macfilter addr add %s' % macAddr print(cmd) ret = self.__executeCommand(cmd)[-1] == 'Done' self._addressfilterSet.add(macAddr) - print('current whitelist entries:') + print('current allowlist entries:') for addr in self._addressfilterSet: print(addr) return ret @@ -975,21 +975,21 @@ class OpenThreadTHCI(object): @API def clearBlockList(self): - """clear all entries in blacklist table + """clear all entries in denylist table Returns: - True: successful to clear the blacklist - False: fail to clear the blacklist + True: successful to clear the denylist + False: fail to clear the denylist """ print('%s call clearBlockList' % self.port) - # remove all entries in blacklist + # remove all entries in denylist try: - print('clearing blacklist entries:') + print('clearing denylist entries:') for addr in self._addressfilterSet: print(addr) - # disable blacklist + # disable denylist if self.__setAddressfilterMode('disable'): self._addressfilterMode = 'disable' # clear ops @@ -1003,21 +1003,21 @@ class OpenThreadTHCI(object): @API def clearAllowList(self): - """clear all entries in whitelist table + """clear all entries in allowlist table Returns: - True: successful to clear the whitelist - False: fail to clear the whitelist + True: successful to clear the allowlist + False: fail to clear the allowlist """ print('%s call clearAllowList' % self.port) - # remove all entries in whitelist + # remove all entries in allowlist try: - print('clearing whitelist entries:') + print('clearing allowlist entries:') for addr in self._addressfilterSet: print(addr) - # disable whitelist + # disable allowlist if self.__setAddressfilterMode('disable'): self._addressfilterMode = 'disable' # clear ops @@ -1319,7 +1319,7 @@ class OpenThreadTHCI(object): self.networkDataRequirement = '' # indicate if Thread device experiences a power down event self.isPowerDown = False - # indicate AddressFilter mode ['disable', 'whitelist', 'blacklist'] + # indicate AddressFilter mode ['disable', 'allowlist', 'denylist'] self._addressfilterMode = 'disable' self._addressfilterSet = set() # cache filter entries # indicate if Thread device is an active commissioner diff --git a/tools/harness-thci/OpenThread_WpanCtl.py b/tools/harness-thci/OpenThread_WpanCtl.py index 2a02ed7f1..bbaac2263 100644 --- a/tools/harness-thci/OpenThread_WpanCtl.py +++ b/tools/harness-thci/OpenThread_WpanCtl.py @@ -388,11 +388,11 @@ class OpenThread_WpanCtl(IThci): """ print('call setAddressFilterMode() %s' % mode) try: - if mode in ('whitelist', 'blacklist'): + if mode in ('allowlist', 'denylist'): cmd = self.wpan_cmd_prefix + 'setprop MAC:' + mode.capitalize() + ':Enabled 1' elif mode == 'disable': if self._addressfilterMode != 'disable': - assert self._addressfilterMode in ('whitelist', 'blacklist'), self._addressfilterMode + assert self._addressfilterMode in ('allowlist', 'denylist'), self._addressfilterMode cmd = self.wpan_cmd_prefix + 'setprop MAC:' + self._addressfilterMode.capitalize() + ':Enabled 0' else: return True @@ -416,15 +416,15 @@ class OpenThread_WpanCtl(IThci): print('call startOpenThreadWpan') try: - # restore whitelist/blacklist address filter mode if rejoin after + # restore allowlist/denylist address filter mode if rejoin after # reset if self.isPowerDown: - if self._addressfilterMode == 'whitelist': - if self.__setAddressfilterMode('whitelist'): + if self._addressfilterMode == 'allowlist': + if self.__setAddressfilterMode('allowlist'): for addr in self._addressfilterSet: self.addAllowMAC(addr) - elif self._addressfilterMode == 'blacklist': - if self.__setAddressfilterMode('blacklist'): + elif self._addressfilterMode == 'denylist': + if self.__setAddressfilterMode('denylist'): for addr in self._addressfilterSet: self.addBlockedMAC(addr) time.sleep(1) @@ -1021,14 +1021,14 @@ class OpenThread_WpanCtl(IThci): ModuleHelper.WriteIntoDebugLogger('setNetworkkey() Error: ' + str(e)) def addBlockedMAC(self, xEUI): - """add a given extended address to the blacklist entry + """add a given extended address to the denylist entry Args: xEUI: extended address in hex format Returns: - True: successful to add a given extended address to the blacklist entry - False: fail to add a given extended address to the blacklist entry + True: successful to add a given extended address to the denylist entry + False: fail to add a given extended address to the denylist entry """ print('%s call addBlockedMAC' % self.port) print(xEUI) @@ -1043,14 +1043,14 @@ class OpenThread_WpanCtl(IThci): print('block device itself') return True - if self._addressfilterMode != 'blacklist': - self.__setAddressfilterMode('blacklist') + if self._addressfilterMode != 'denylist': + self.__setAddressfilterMode('denylist') - cmd = self.wpan_cmd_prefix + 'insert MAC:Blacklist:Entries %s' % macAddr + cmd = self.wpan_cmd_prefix + 'insert MAC:Denylist:Entries %s' % macAddr ret = self.__sendCommand(cmd)[0] != 'Fail' self._addressfilterSet.add(macAddr) - print('current blacklist entries:') + print('current denylist entries:') for addr in self._addressfilterSet: print(addr) @@ -1059,14 +1059,14 @@ class OpenThread_WpanCtl(IThci): ModuleHelper.WriteIntoDebugLogger('addBlockedMAC() Error: ' + str(e)) def addAllowMAC(self, xEUI): - """add a given extended address to the whitelist addressfilter + """add a given extended address to the allowlist addressfilter Args: xEUI: a given extended address in hex format Returns: - True: successful to add a given extended address to the whitelist entry - False: fail to add a given extended address to the whitelist entry + True: successful to add a given extended address to the allowlist entry + False: fail to add a given extended address to the allowlist entry """ print('%s call addAllowMAC' % self.port) print(xEUI) @@ -1076,14 +1076,14 @@ class OpenThread_WpanCtl(IThci): macAddr = self.__convertLongToHex(xEUI) try: - if self._addressfilterMode != 'whitelist': - self.__setAddressfilterMode('whitelist') + if self._addressfilterMode != 'allowlist': + self.__setAddressfilterMode('allowlist') - cmd = self.wpan_cmd_prefix + 'insert MAC:Whitelist:Entries %s' % macAddr + cmd = self.wpan_cmd_prefix + 'insert MAC:Allowlist:Entries %s' % macAddr ret = self.__sendCommand(cmd)[0] != 'Fail' self._addressfilterSet.add(macAddr) - print('current whitelist entries:') + print('current allowlist entries:') for addr in self._addressfilterSet: print(addr) return ret @@ -1092,25 +1092,25 @@ class OpenThread_WpanCtl(IThci): ModuleHelper.WriteIntoDebugLogger('addAllowMAC() Error: ' + str(e)) def clearBlockList(self): - """clear all entries in blacklist table + """clear all entries in denylist table Returns: - True: successful to clear the blacklist - False: fail to clear the blacklist + True: successful to clear the denylist + False: fail to clear the denylist """ print('%s call clearBlockList' % self.port) - # remove all entries in blacklist + # remove all entries in denylist try: - print('clearing blacklist entries:') + print('clearing denylist entries:') for addr in self._addressfilterSet: print(addr) - # disable blacklist + # disable denylist if self.__setAddressfilterMode('disable'): # clear ops for addr in self._addressfilterSet: - cmd = self.wpan_cmd_prefix + 'remove MAC:Blacklist:Entries ' + addr + cmd = self.wpan_cmd_prefix + 'remove MAC:Denylist:Entries ' + addr self.__sendCommand(cmd) self._addressfilterSet.clear() @@ -1121,25 +1121,25 @@ class OpenThread_WpanCtl(IThci): ModuleHelper.WriteIntoDebugLogger('clearBlockList() Error: ' + str(e)) def clearAllowList(self): - """clear all entries in whitelist table + """clear all entries in allowlist table Returns: - True: successful to clear the whitelist - False: fail to clear the whitelist + True: successful to clear the allowlist + False: fail to clear the allowlist """ print('%s call clearAllowList' % self.port) - # remove all entries in whitelist + # remove all entries in allowlist try: - print('clearing whitelist entries:') + print('clearing allowlist entries:') for addr in self._addressfilterSet: print(addr) - # disable whitelist + # disable allowlist if self.__setAddressfilterMode('disable'): # clear ops for addr in self._addressfilterSet: - cmd = self.wpan_cmd_prefix + 'remove MAC:Whitelist:Entries ' + addr + cmd = self.wpan_cmd_prefix + 'remove MAC:Allowlist:Entries ' + addr self.__sendCommand(cmd) self._addressfilterSet.clear() @@ -1453,7 +1453,7 @@ class OpenThread_WpanCtl(IThci): self.networkDataRequirement = '' # indicate if Thread device experiences a power down event self.isPowerDown = False - # indicate AddressFilter mode ['disable', 'whitelist', 'blacklist'] + # indicate AddressFilter mode ['disable', 'allowlist', 'denylist'] self._addressfilterMode = 'disable' self._addressfilterSet = set() # cache filter entries # indicate if Thread device is an active commissioner