From c1e2e168d6e929db98e68d0860b7d4437eff5f1d Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Wed, 12 May 2021 03:56:33 +0800 Subject: [PATCH] [tests] set default node parameters (#6593) This commit set default node parameters and remove unnecessary parameters in topologies. - router selection jitter to 1s - panid to 0xface --- .../thread-cert/Cert_5_1_01_RouterAttach.py | 3 - .../Cert_5_1_02_ChildAddressTimeout.py | 5 -- .../Cert_5_1_03_RouterAddressReallocation.py | 5 -- .../Cert_5_1_04_RouterAddressReallocation.py | 5 -- .../Cert_5_1_05_RouterAddressTimeout.py | 3 - .../thread-cert/Cert_5_1_06_RemoveRouterId.py | 3 - .../thread-cert/Cert_5_1_07_MaxChildCount.py | 13 ---- .../Cert_5_1_08_RouterAttachConnectivity.py | 9 --- .../Cert_5_1_09_REEDAttachConnectivity.py | 7 -- .../Cert_5_1_10_RouterAttachLinkQuality.py | 7 -- .../Cert_5_1_11_REEDAttachLinkQuality.py | 6 -- .../Cert_5_1_12_NewRouterNeighborSync.py | 5 -- .../thread-cert/Cert_5_1_13_RouterReset.py | 3 - .../thread-cert/Cert_5_2_01_REEDAttach.py | 6 -- .../Cert_5_2_03_LeaderReject2Hops.py | 64 ------------------- .../thread-cert/Cert_5_2_04_REEDUpgrade.py | 34 ---------- .../thread-cert/Cert_5_2_05_AddressQuery.py | 34 ---------- .../Cert_5_2_06_RouterDowngrade.py | 48 -------------- .../Cert_5_2_07_REEDSynchronization.py | 34 ---------- .../thread-cert/Cert_5_3_01_LinkLocal.py | 3 - .../thread-cert/Cert_5_3_02_RealmLocal.py | 6 -- .../thread-cert/Cert_5_3_03_AddressQuery.py | 8 --- .../Cert_5_3_04_AddressMapCache.py | 8 --- .../Cert_5_3_05_RoutingLinkQuality.py | 7 -- .../thread-cert/Cert_5_3_06_RouterIdMask.py | 5 -- .../Cert_5_3_07_DuplicateAddress.py | 8 --- .../Cert_5_3_08_ChildAddressSet.py | 5 -- .../thread-cert/Cert_5_3_09_AddressQuery.py | 8 --- .../thread-cert/Cert_5_3_10_AddressQuery.py | 8 --- ...ert_5_3_11_AddressQueryTimeoutIntervals.py | 4 -- .../thread-cert/Cert_5_5_01_LeaderReboot.py | 3 - .../thread-cert/Cert_5_5_02_LeaderReboot.py | 5 -- .../Cert_5_5_03_SplitMergeChildren.py | 8 --- .../Cert_5_5_04_SplitMergeRouters.py | 10 --- .../thread-cert/Cert_5_5_05_SplitMergeREED.py | 32 ---------- .../Cert_5_5_07_SplitMergeThreeWay.py | 8 --- ...1_NetworkDataRegisterBeforeAttachLeader.py | 5 -- ...2_NetworkDataRegisterBeforeAttachRouter.py | 5 -- ...03_NetworkDataRegisterAfterAttachLeader.py | 5 -- ...04_NetworkDataRegisterAfterAttachRouter.py | 5 -- ...05_NetworkDataRegisterAfterAttachRouter.py | 5 -- .../Cert_5_6_06_NetworkDataExpiration.py | 5 -- .../Cert_5_6_07_NetworkDataRequestREED.py | 32 ---------- .../Cert_5_6_09_NetworkDataForwarding.py | 7 -- .../Cert_5_7_01_CoapDiagCommands.py | 1 - .../Cert_5_7_02_CoapDiagCommands.py | 32 ---------- .../Cert_5_7_03_CoapDiagCommands.py | 1 - .../thread-cert/Cert_5_8_02_KeyIncrement.py | 3 - .../Cert_5_8_03_KeyIncrementRollOver.py | 3 - .../Cert_5_8_04_SecurityPolicyTLV.py | 4 -- .../thread-cert/Cert_6_1_01_RouterAttach.py | 2 - .../thread-cert/Cert_6_1_02_REEDAttach.py | 4 -- .../Cert_6_1_03_RouterAttachConnectivity.py | 8 --- .../Cert_6_1_04_REEDAttachConnectivity.py | 6 -- .../Cert_6_1_05_REEDAttachConnectivity.py | 6 -- .../Cert_6_1_06_REEDAttachLinkQuality.py | 6 -- .../Cert_6_1_07_RouterAttachLinkQuality.py | 6 -- .../thread-cert/Cert_6_2_01_NewPartition.py | 4 -- .../thread-cert/Cert_6_2_02_NewPartition.py | 6 -- .../thread-cert/Cert_6_3_01_OrphanReattach.py | 4 -- .../Cert_6_3_02_NetworkDataUpdate.py | 2 - .../thread-cert/Cert_6_4_01_LinkLocal.py | 2 - .../thread-cert/Cert_6_4_02_RealmLocal.py | 4 -- .../Cert_6_5_01_ChildResetReattach.py | 2 - .../Cert_6_5_02_ChildResetReattach.py | 4 -- .../Cert_6_5_03_ChildResetSynchronize.py | 2 - .../thread-cert/Cert_6_6_01_KeyIncrement.py | 2 - .../Cert_6_6_02_KeyIncrementRollOver.py | 2 - .../Cert_7_1_01_BorderRouterAsLeader.py | 5 -- .../Cert_7_1_02_BorderRouterAsRouter.py | 5 -- .../Cert_7_1_03_BorderRouterAsLeader.py | 5 -- .../Cert_7_1_04_BorderRouterAsRouter.py | 5 -- .../Cert_7_1_05_BorderRouterAsRouter.py | 5 -- .../Cert_7_1_06_BorderRouterAsLeader.py | 7 -- .../Cert_7_1_07_BorderRouterAsLeader.py | 8 --- .../Cert_7_1_08_BorderRouterAsFED.py | 5 -- .../thread-cert/Cert_8_1_01_Commissioning.py | 2 - .../thread-cert/Cert_8_1_02_Commissioning.py | 2 - .../thread-cert/Cert_8_1_06_Commissioning.py | 2 - .../thread-cert/Cert_8_2_01_JoinerRouter.py | 4 -- .../thread-cert/Cert_8_2_02_JoinerRouter.py | 4 -- .../thread-cert/Cert_8_2_05_JoinerRouter.py | 4 -- .../Cert_8_3_01_CommissionerPetition.py | 3 - .../Cert_9_2_01_MGMTCommissionerGet.py | 4 -- .../Cert_9_2_02_MGMTCommissionerSet.py | 4 -- .../Cert_9_2_03_ActiveDatasetGet.py | 4 -- .../thread-cert/Cert_9_2_04_ActiveDataset.py | 4 -- .../thread-cert/Cert_9_2_05_ActiveDataset.py | 4 -- .../Cert_9_2_06_DatasetDissemination.py | 3 - .../thread-cert/Cert_9_2_07_DelayTimer.py | 6 -- .../Cert_9_2_08_PersistentDatasets.py | 2 - .../Cert_9_2_09_PendingPartition.py | 4 -- .../Cert_9_2_10_PendingPartition.py | 8 --- .../thread-cert/Cert_9_2_11_MasterKey.py | 3 - .../thread-cert/Cert_9_2_12_Announce.py | 2 - .../thread-cert/Cert_9_2_13_EnergyScan.py | 6 -- .../thread-cert/Cert_9_2_14_PanIdQuery.py | 5 -- .../Cert_9_2_15_PendingPartition.py | 4 -- .../Cert_9_2_16_ActivePendingPartition.py | 4 -- .../scripts/thread-cert/Cert_9_2_17_Orphan.py | 2 - .../Cert_9_2_18_RollBackActiveTimestamp.py | 3 - .../Cert_9_2_19_PendingDatasetGet.py | 4 -- tests/scripts/thread-cert/Test_MacScan.py | 2 - .../thread-cert/backbone/bbr_5_11_01.py | 3 - .../scripts/thread-cert/backbone/test_bmlr.py | 4 -- .../thread-cert/backbone/test_dua_dad.py | 5 -- .../thread-cert/backbone/test_dua_routing.py | 5 -- ...not_send_icmpv6_destination_unreachable.py | 2 - .../backbone/test_mlr_multicast_routing.py | 4 -- ...lr_multicast_routing_across_thread_pans.py | 4 -- .../test_mlr_multicast_routing_timeout.py | 2 - .../thread-cert/backbone/test_ndproxy.py | 3 - .../border_router/MATN_02_MLRFirstUse.py | 3 - ...TN_03_InvalidCommissionerDeregistration.py | 3 - .../MATN_04_MulticastListenerTimeout.py | 3 - ...N_05_ReregistrationToSameMulticastGroup.py | 3 - .../MATN_09_DefaultBRMulticastForwarding.py | 3 - .../MATN_12_HopLimitProcessing.py | 2 - ..._ChangeOfPrimaryBBRTriggersRegistration.py | 4 -- ...umberOfMulticastGroupSubscriptionsToBBR.py | 2 - .../border_router/test_advertising_proxy.py | 2 - .../border_router/test_dnssd_server.py | 3 - .../test_multi_border_routers.py | 4 -- .../test_multi_thread_networks.py | 4 -- .../test_plat_udp_accessiblity.py | 2 - .../border_router/test_radvd_coexist.py | 1 - .../test_single_border_router.py | 1 - tests/scripts/thread-cert/config.py | 1 + tests/scripts/thread-cert/test_anycast.py | 10 --- tests/scripts/thread-cert/test_coap_block.py | 3 - .../scripts/thread-cert/test_coap_observe.py | 3 - tests/scripts/thread-cert/test_coaps.py | 3 - .../thread-cert/test_dataset_updater.py | 5 -- tests/scripts/thread-cert/test_dnssd.py | 5 -- .../thread-cert/test_ipv6_fragmentation.py | 1 - .../thread-cert/test_ipv6_source_selection.py | 1 - .../thread-cert/test_on_mesh_prefix.py | 5 -- tests/scripts/thread-cert/test_pbbr_aloc.py | 3 - tests/scripts/thread-cert/test_ping.py | 3 - .../test_reed_address_solicit_rejected.py | 3 - tests/scripts/thread-cert/test_reset.py | 4 -- tests/scripts/thread-cert/test_route_table.py | 5 -- .../thread-cert/test_router_reattach.py | 64 ------------------- tests/scripts/thread-cert/test_service.py | 5 -- .../thread-cert/test_srp_auto_start_mode.py | 5 -- tests/scripts/thread-cert/test_srp_lease.py | 3 - .../thread-cert/test_srp_name_conflicts.py | 5 -- .../test_srp_register_single_service.py | 3 - tests/scripts/thread-cert/thread_cert.py | 25 ++++++-- .../v1_2_LowPower_5_3_01_SSEDAttachment.py | 4 -- ...Power_6_1_07_PreferringARouterOverAReed.py | 5 -- ..._SingleProbeLinkMetricsWithEnhancedAcks.py | 3 - ...2_LowPower_7_2_01_ForwardTrackingSeries.py | 3 - ...2_LowPower_test_forward_tracking_series.py | 2 - .../v1_2_test_dua_handle_address_error.py | 5 +- ..._2_test_multicast_listener_registration.py | 4 -- 156 files changed, 20 insertions(+), 1002 deletions(-) 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 1b1d8fa28..a3f79264a 100755 --- a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py @@ -64,14 +64,11 @@ class Cert_5_1_01_RouterAttach(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py index be4a78c46..ae03a24bf 100755 --- a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py @@ -68,21 +68,17 @@ class Cert_5_1_02_ChildAddressTimeout(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MED, SED] }, MED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -90,7 +86,6 @@ class Cert_5_1_02_ChildAddressTimeout(thread_cert.TestCase): 'name': 'SED', 'is_mtd': True, 'mode': 'n', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py index 9c7b314ba..ffa991432 100755 --- a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py @@ -64,21 +64,16 @@ class Cert_5_1_03_RouterAddressReallocation(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py index b9cf8cfbf..76d07d788 100755 --- a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py @@ -65,22 +65,17 @@ class Cert_5_1_04_RouterAddressReallocation(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'partition_id': 1, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py index 29a936d78..46cb5dcfc 100755 --- a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py @@ -62,14 +62,11 @@ class Cert_5_1_05_RouterAddressTimeout(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py index b0590df86..73c4c4ef5 100755 --- a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py +++ b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py @@ -64,14 +64,11 @@ class Cert_5_1_06_RemoveRouterId(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py index d16bac832..b6364d996 100755 --- a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py +++ b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py @@ -70,22 +70,18 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'max_children': 10, 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, 3, 4, 5, 6, SED1, 8, 9, 10, 11, 12] }, 3: { 'name': 'MED1', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -93,7 +89,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'MED2', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -101,7 +96,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'MED3', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -109,7 +103,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'MED4', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -117,7 +110,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED1', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -125,7 +117,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED2', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -133,7 +124,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED3', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -141,7 +131,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED4', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -149,7 +138,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED5', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, @@ -157,7 +145,6 @@ class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): 'name': 'SED6', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py index 7152918a1..bf1f0a14d 100755 --- a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py @@ -67,35 +67,26 @@ class Cert_5_1_08_RouterAttachConnectivity(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER4] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, ROUTER4] }, ROUTER4: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER2, ROUTER3] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py index 9482cad23..33bad5cff 100755 --- a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py @@ -67,35 +67,28 @@ class Cert_5_1_09_REEDAttachConnectivity(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, REED1, REED2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, REED1: { 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1, ROUTER2] }, REED2: { 'name': 'REED_2', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [REED1, REED2] }, } 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 bbcc3d59c..5c60106cf 100755 --- a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py @@ -65,28 +65,21 @@ class Cert_5_1_10_RouterAttachLinkQuality(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, (ROUTER3, -85)] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py index e016596f3..0da95cd01 100755 --- a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py @@ -66,28 +66,22 @@ class Cert_5_1_11_REEDAttachLinkQuality(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [REED, ROUTER2] }, REED: { 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, (ROUTER1, -85)] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [REED, ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py index 9af0f6662..5c2917c02 100755 --- a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py +++ b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py @@ -61,21 +61,16 @@ class Cert_5_1_12_NewRouterSync(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py index 5ff3bfd98..54555019b 100755 --- a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py +++ b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py @@ -63,14 +63,11 @@ class Cert_5_1_13_RouterReset(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py index eeb033a7e..ae0cc6eaf 100755 --- a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py +++ b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py @@ -69,21 +69,16 @@ class Cert_5_2_01_REEDAttach(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, REED1: { 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 1, 'allowlist': [DUT_ROUTER1, MED1] }, @@ -91,7 +86,6 @@ class Cert_5_2_01_REEDAttach(thread_cert.TestCase): 'name': 'MED_1', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [REED1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py index 0643dd1c3..e91509a86 100755 --- a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py +++ b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py @@ -85,288 +85,224 @@ class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): ROUTER_1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER, ROUTER_32] }, 3: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 16: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 17: { 'name': 'ROUTER_16', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 18: { 'name': 'ROUTER_17', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 19: { 'name': 'ROUTER_18', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 20: { 'name': 'ROUTER_19', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 21: { 'name': 'ROUTER_20', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 22: { 'name': 'ROUTER_21', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 23: { 'name': 'ROUTER_22', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 24: { 'name': 'ROUTER_23', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 25: { 'name': 'ROUTER_24', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 26: { 'name': 'ROUTER_25', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 27: { 'name': 'ROUTER_26', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 28: { 'name': 'ROUTER_27', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 29: { 'name': 'ROUTER_28', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 30: { 'name': 'ROUTER_29', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, 31: { 'name': 'ROUTER_30', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, ROUTER_31: { 'name': 'ROUTER_31', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, 'allowlist': [DUT_LEADER] }, ROUTER_32: { 'name': 'ROUTER_32', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 33, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 33, '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 ef659089a..20aafa212 100755 --- a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py @@ -78,125 +78,91 @@ class Cert_5_2_4_REEDUpgrade(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER] }, 2: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 3: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_REED] }, DUT_REED: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER, MED] }, MED: { 'name': 'MED', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_REED] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py index 615e031f2..d6f352af7 100755 --- a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py @@ -79,126 +79,92 @@ class Cert_5_2_5_AddressQuery(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, BR, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, MED] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_REED] }, BR: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 16: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, MED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, DUT_REED: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py b/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py index fa6be1be4..32bf0386a 100755 --- a/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py @@ -67,191 +67,143 @@ class Cert_5_2_06_RouterDowngrade(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, DUT_ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 16: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 17: { 'name': 'ROUTER_16', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 18: { 'name': 'ROUTER_17', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 19: { 'name': 'ROUTER_18', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 20: { 'name': 'ROUTER_19', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 21: { 'name': 'ROUTER_20', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 22: { 'name': 'ROUTER_21', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 23: { 'name': 'ROUTER_22', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, ROUTER23: { 'name': 'ROUTER_23', 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, } 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 680e803d6..bc1a251be 100755 --- a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py @@ -75,104 +75,70 @@ class Cert_5_2_7_REEDSynchronization_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, DUT_ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, 16: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, DUT_REED: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py index 9a4a534d7..dc0b7ca3c 100755 --- a/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py @@ -61,13 +61,10 @@ class Cert_5_3_1_LinkLocal(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface }, DUT_ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py index 3b1262777..9ff9bfd1a 100755 --- a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py @@ -65,28 +65,22 @@ class Cert_5_3_2_RealmLocal(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, DUT_ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, SED1] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': 'n', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [DUT_ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py index 39fc0d1cb..2490e9a9f 100755 --- a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py @@ -67,35 +67,27 @@ class Cert_5_3_3_AddressQuery(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, DUT_ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3, MED1] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, MED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': 3, 'allowlist': [DUT_ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py index 032d51568..06a81e733 100755 --- a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py +++ b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py @@ -70,21 +70,17 @@ class Cert_5_3_4_AddressMapCache(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1, MED1, MED2, MED3, MED4] }, DUT_ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, SED1] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': 5, 'allowlist': [DUT_ROUTER1] }, @@ -92,28 +88,24 @@ class Cert_5_3_4_AddressMapCache(thread_cert.TestCase): 'name': 'MED_1', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, MED2: { 'name': 'MED_2', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, MED3: { 'name': 'MED_3', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, MED4: { 'name': 'MED_4', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py index 7499b5ae8..5cb8d7e67 100755 --- a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py @@ -64,28 +64,21 @@ class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1, ROUTER2] }, DUT_ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER1] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py index c0a7d2350..71ecf8275 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py @@ -64,21 +64,16 @@ class Cert_5_3_6_RouterIdMask(thread_cert.TestCase): DUT_LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, ROUTER2] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py index c4df00f9a..669fcfd87 100755 --- a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py +++ b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py @@ -73,42 +73,34 @@ class Cert_5_3_7_DuplicateAddress(thread_cert.TestCase): DUT_LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, MED2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, MED1] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER, SED1] }, MED1: { 'name': 'MED_1', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'allowlist': [ROUTER2] }, MED2: { 'name': 'MED_2', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [DUT_LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py index 7d5ea19a0..4f7fe00f6 100755 --- a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py +++ b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py @@ -69,27 +69,22 @@ class Cert_5_3_8_ChildAddressSet(thread_cert.TestCase): DUT_LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [BR, MED1, MED2] }, BR: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER] }, MED1: { 'name': 'MED_1', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [DUT_LEADER] }, MED2: { 'name': 'MED_2', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [DUT_LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py index 5164cc937..1f51345dc 100755 --- a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py @@ -75,35 +75,27 @@ class Cert_5_3_09_AddressQuery(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, DUT_ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, DUT_ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, SED1] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [DUT_ROUTER2] }, diff --git a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py index 910233159..8c3b1642e 100755 --- a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py @@ -77,35 +77,27 @@ class Cert_5_3_10_AddressQuery(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [BR, ROUTER1, DUT_ROUTER2] }, BR: { 'name': 'BR', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT_ROUTER2] }, DUT_ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, MED1] }, MED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py index 1e5a70a9c..a7f0fec8b 100755 --- a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py +++ b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py @@ -68,21 +68,17 @@ class Cert_5_3_11_AddressQueryTimeoutIntervals(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MED1] }, MED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py index 63d1ab189..70239e0f6 100755 --- a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py @@ -64,14 +64,11 @@ class Cert_5_5_1_LeaderReboot(thread_cert.TestCase): DUT_LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [DUT_ROUTER1] }, DUT_ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [DUT_LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py index 8ad6d9467..5c0f95ea5 100755 --- a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py @@ -45,22 +45,17 @@ class Cert_5_5_2_LeaderReboot(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py index dd6ef567d..d316b3726 100755 --- a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py +++ b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py @@ -51,36 +51,28 @@ class Cert_5_5_3_SplitMergeChildren(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED3] }, ED2: { 'name': 'MED_2', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ED3: { 'name': 'MED_3', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER2] }, } 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 080c3549b..1473ac429 100755 --- a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py +++ b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py @@ -45,36 +45,26 @@ class Cert_5_5_4_SplitMergeRouters(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER4] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, ROUTER4: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py index e695aa59c..154b069f0 100755 --- a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py +++ b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py @@ -46,106 +46,74 @@ class Cert_5_5_5_SplitMergeREED(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, 5: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER15: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, REED1: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py index 58538ffeb..df8f2e523 100755 --- a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py +++ b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py @@ -44,29 +44,21 @@ class Cert_5_5_7_SplitMergeThreeWay(thread_cert.TestCase): LEADER1: { 'name': 'LEADER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py index fc5055917..a76bac5cc 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -48,28 +48,23 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py index ed57d0c9c..283627925 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -48,28 +48,23 @@ class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py index e48820484..ea331cee9 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -48,28 +48,23 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py index be35d6087..ef32030e3 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -48,28 +48,23 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py index 40ee50e6e..ad395ddf1 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -48,28 +48,23 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py index d89b0c756..d1b256465 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -48,28 +48,23 @@ class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, ED1, SED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED1: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py index f1546fa1d..2e51c791f 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -46,105 +46,73 @@ class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED1] }, ROUTER3: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER15: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, REED1: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py index 86646e1fe..224b06ec7 100755 --- a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py +++ b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py @@ -49,35 +49,28 @@ class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED, SED] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, SED: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py index 208d0904f..0fd6ddcf4 100755 --- a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands.py @@ -81,7 +81,6 @@ class Cert_5_7_01_CoapDiagCommands_Base(thread_cert.TestCase): ROUTER1: { 'mode': 'rdn', 'allowlist': [LEADER, REED1, SED1, MED1, FED1], - 'router_selection_jitter': 1 }, REED1: { 'name': 'REED', diff --git a/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py index 90ba191d5..ee8005035 100755 --- a/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py @@ -72,118 +72,86 @@ class Cert_5_7_02_CoapDiagCommands(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ROUTER15] }, 2: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 3: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 4: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 5: { 'name': 'ROUTER_4', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 6: { 'name': 'ROUTER_5', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 7: { 'name': 'ROUTER_6', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 8: { 'name': 'ROUTER_7', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 9: { 'name': 'ROUTER_8', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 10: { 'name': 'ROUTER_9', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 11: { 'name': 'ROUTER_10', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 12: { 'name': 'ROUTER_11', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 13: { 'name': 'ROUTER_12', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 14: { 'name': 'ROUTER_13', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, 15: { 'name': 'ROUTER_14', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER15: { 'name': 'ROUTER_15', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED] }, REED: { 'name': 'DUT', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER15] }, } diff --git a/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py b/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py index 64afad129..1b4e7a245 100755 --- a/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py +++ b/tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py @@ -81,7 +81,6 @@ class Cert_5_7_03_CoapDiagCommands_Base(thread_cert.TestCase): ROUTER1: { 'mode': 'rdn', 'allowlist': [LEADER, SED1, MED1, FED1], - 'router_selection_jitter': 1 }, SED1: { 'name': 'SED', 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 e156eaee9..967a33a20 100755 --- a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py @@ -43,15 +43,12 @@ class Cert_5_8_2_KeyIncrement(thread_cert.TestCase): 'name': 'LEADER', 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py index d1981329f..3bb6e72a3 100755 --- a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py @@ -44,15 +44,12 @@ class Cert_5_8_3_KeyIncrementRollOver(thread_cert.TestCase): 'key_sequence_counter': 127, 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_5_8_04_SecurityPolicyTLV.py b/tests/scripts/thread-cert/Cert_5_8_04_SecurityPolicyTLV.py index b9b8c4022..99686e74e 100755 --- a/tests/scripts/thread-cert/Cert_5_8_04_SecurityPolicyTLV.py +++ b/tests/scripts/thread-cert/Cert_5_8_04_SecurityPolicyTLV.py @@ -80,7 +80,6 @@ class Cert_5_8_04_SecurityPolicyTLV(thread_cert.TestCase): 'security_policy': [3600, 'onrcb'] }, 'mode': 'rdn', - 'router_selection_jitter': 1 }, COMMISSIONER_1: { 'name': 'COMMISSIONER_1', @@ -91,12 +90,10 @@ class Cert_5_8_04_SecurityPolicyTLV(thread_cert.TestCase): 'security_policy': [3600, 'onrcb'] }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, COMMISSIONER_2: { 'name': 'COMMISSIONER_2', - 'router_selection_jitter': 1, 'mode': 'rdn', 'allowlist': [LEADER] }, @@ -109,7 +106,6 @@ class Cert_5_8_04_SecurityPolicyTLV(thread_cert.TestCase): 'security_policy': [3600, 'onrcb'] }, 'mode': 'rdn', - 'router_selection_jitter': 1 }, } 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 37e1be28f..4867947ea 100755 --- a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py @@ -64,13 +64,11 @@ class Cert_6_1_1_RouterAttach_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach.py index 4bfacab2d..ce6383166 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach.py @@ -66,21 +66,17 @@ class Cert_6_1_2_REEDAttach_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [REED] }, REED: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED] }, diff --git a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py index a01ae2b9d..e5d2dce19 100755 --- a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py @@ -46,35 +46,27 @@ class Cert_6_1_3_RouterAttachConnectivity(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2, ROUTER3] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER3] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ROUTER3: { 'name': 'ROUTER_3', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1, ED] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER2, ROUTER3] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py b/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py index 7ab0009f9..a073cde7e 100755 --- a/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py @@ -67,34 +67,28 @@ class Cert_6_1_4_REEDAttachConnectivity_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, REED_1, REED_2] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED_1] }, REED_1: { 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER, MTD] }, REED_2: { 'name': 'REED_2', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED_1, REED_2] }, 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 f51cc0f84..7264fb1d0 100755 --- a/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_05_REEDAttachConnectivity.py @@ -45,27 +45,22 @@ class Cert_6_1_5_REEDAttachConnectivity(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, REED1, REED2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, REED2] }, REED1: { 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, ROUTER1, ED] }, REED2: { 'name': 'REED_2', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, (ED, -85)] }, @@ -73,7 +68,6 @@ class Cert_6_1_5_REEDAttachConnectivity(thread_cert.TestCase): 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [REED1, REED2] }, } diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality.py index 13ea5bd4c..73b897ad1 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality.py @@ -68,28 +68,22 @@ class Cert_6_1_6_REEDAttachLinkQuality_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [REED, ROUTER] }, REED: { 'name': 'REED', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MTD] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, (MTD, -85)] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [REED, ROUTER] }, 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 318c943c9..75a7aed27 100755 --- a/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_6_1_07_RouterAttachLinkQuality.py @@ -44,28 +44,22 @@ class Cert_6_1_7_RouterAttachLinkQuality(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, (ED, -85)] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, } diff --git a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py index ead96932d..03d36d7f8 100755 --- a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py @@ -66,20 +66,16 @@ class Cert_6_2_1_NewPartition_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, '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 2a0789668..5be9b7b9e 100755 --- a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py @@ -44,29 +44,23 @@ class Cert_6_2_2_NewPartition(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2, ED] }, ROUTER2: { 'name': 'ROUTER_2', 'mode': 'rdn', 'network_id_timeout': 110, - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py index d6ec94210..fd4887e87 100755 --- a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py +++ b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py @@ -43,21 +43,17 @@ class Cert_6_3_1_OrphanReattach(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': 10, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py index 3d28e53c3..db0badb74 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -42,14 +42,12 @@ class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': 10, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py index 8e1f270f9..3faa013ce 100755 --- a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py @@ -63,13 +63,11 @@ class Cert_6_4_1_LinkLocal_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, '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 41cfc7c97..e7a47ad8e 100755 --- a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py @@ -63,20 +63,16 @@ class Cert_6_4_2_RealmLocal_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py index 3ec6a5444..12a455962 100755 --- a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetReattach.py @@ -42,14 +42,12 @@ class Cert_6_5_1_ChildResetReattach(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py index 5755a41b4..21ea2e1f7 100755 --- a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py @@ -68,20 +68,16 @@ class Cert_6_5_2_ChildResetReattach_Base(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MTD] }, MTD: { 'name': 'DUT', 'is_mtd': True, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, 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 203d20181..0bca59802 100755 --- a/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py +++ b/tests/scripts/thread-cert/Cert_6_5_03_ChildResetSynchronize.py @@ -43,14 +43,12 @@ class Cert_6_5_3_ChildResetSynchronize(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { 'name': 'ED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py index 10ff33b51..33343a082 100755 --- a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py @@ -43,7 +43,6 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase): 'name': 'LEADER', 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { @@ -51,7 +50,6 @@ class Cert_6_6_1_KeyIncrement(thread_cert.TestCase): 'is_mtd': True, 'key_switch_guardtime': 0, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py index 57aff0fe4..d6f8939d9 100755 --- a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py @@ -44,7 +44,6 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase): 'key_sequence_counter': 127, 'key_switch_guardtime': 0, 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ED] }, ED: { @@ -52,7 +51,6 @@ class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase): 'is_mtd': True, 'key_switch_guardtime': 0, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py index 1d5e22230..83ee5db7d 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -70,21 +70,17 @@ class Cert_7_1_1_BorderRouterAsLeader(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, SED1, MED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, @@ -92,7 +88,6 @@ class Cert_7_1_1_BorderRouterAsLeader(thread_cert.TestCase): 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py index 00c9cc4ae..58323afdb 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -48,28 +48,23 @@ class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, SED2] }, ED2: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED2: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py index 852e69c67..c506d7c5e 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -71,21 +71,17 @@ class Cert_7_1_3_BorderRouterAsLeader(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, SED1, MED1] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, SED1: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, @@ -93,7 +89,6 @@ class Cert_7_1_3_BorderRouterAsLeader(thread_cert.TestCase): 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py index 496b3d98b..420fbffad 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -48,28 +48,23 @@ class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED2, SED2] }, ED2: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED2: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py index ba2f4f168..ea7b41162 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -73,28 +73,23 @@ class Cert_7_1_5_BorderRouterAsRouter(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, MED, SED] }, MED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_06_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_06_BorderRouterAsLeader.py index 089864663..ad25b4fc6 100755 --- a/tests/scripts/thread-cert/Cert_7_1_06_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_06_BorderRouterAsLeader.py @@ -76,35 +76,28 @@ class Cert_7_1_6_BorderRouterAsLeader(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER_1, ROUTER_2, MED, SED] }, ROUTER_1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER_2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, MED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER] }, SED: { 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_07_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_07_BorderRouterAsLeader.py index 5b44b0685..be980148e 100755 --- a/tests/scripts/thread-cert/Cert_7_1_07_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_07_BorderRouterAsLeader.py @@ -79,29 +79,22 @@ class Cert_7_1_7_BorderRouterAsLeader(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER_1, ROUTER_2, MED, SED] }, ROUTER_1: { 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, ROUTER_2: { 'name': 'ROUTER_2', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, MED: { 'name': 'MED', 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, @@ -109,7 +102,6 @@ class Cert_7_1_7_BorderRouterAsLeader(thread_cert.TestCase): 'name': 'SED', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [LEADER] }, diff --git a/tests/scripts/thread-cert/Cert_7_1_08_BorderRouterAsFED.py b/tests/scripts/thread-cert/Cert_7_1_08_BorderRouterAsFED.py index 8de9c5c79..a885e6566 100755 --- a/tests/scripts/thread-cert/Cert_7_1_08_BorderRouterAsFED.py +++ b/tests/scripts/thread-cert/Cert_7_1_08_BorderRouterAsFED.py @@ -71,22 +71,17 @@ class Cert_7_1_8_BorderRouterAsFED(thread_cert.TestCase): LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, FED] }, FED: { 'name': 'FED', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, - 'router_selection_jitter': 1, 'allowlist': [ROUTER] }, } diff --git a/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py b/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py index 947e59178..42f6e20ad 100755 --- a/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py @@ -66,13 +66,11 @@ class Cert_8_1_01_Commissioning(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py b/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py index ba0395516..4bfa627da 100755 --- a/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py @@ -45,13 +45,11 @@ class Cert_8_1_02_Commissioning(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_1_06_Commissioning.py b/tests/scripts/thread-cert/Cert_8_1_06_Commissioning.py index b56d97627..023a4f070 100755 --- a/tests/scripts/thread-cert/Cert_8_1_06_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_06_Commissioning.py @@ -66,12 +66,10 @@ class Cert_8_1_06_Commissioning(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, JOINER: { 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py index c2e4b79fb..a10581225 100755 --- a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py @@ -46,20 +46,16 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, JOINER_ROUTER: { 'name': 'JOINER_ROUTER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py index 659917119..b0dc4b970 100755 --- a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py @@ -46,20 +46,16 @@ class Cert_8_2_02_JoinerRouter(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, JOINER_ROUTER: { 'name': 'JOINER_ROUTER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_2_05_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_05_JoinerRouter.py index 7d0851e2a..7b8c72c0a 100755 --- a/tests/scripts/thread-cert/Cert_8_2_05_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_05_JoinerRouter.py @@ -72,20 +72,16 @@ class Cert_8_2_05_JoinerRouter(thread_cert.TestCase): 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, JOINER_ROUTER: { 'name': 'JOINER_ROUTER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, JOINER: { 'name': 'JOINER', 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rdn', - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_8_3_01_CommissionerPetition.py b/tests/scripts/thread-cert/Cert_8_3_01_CommissionerPetition.py index a1b4a6b0e..de03ce469 100755 --- a/tests/scripts/thread-cert/Cert_8_3_01_CommissionerPetition.py +++ b/tests/scripts/thread-cert/Cert_8_3_01_CommissionerPetition.py @@ -67,14 +67,11 @@ class Cert_8_3_01_CommissionerPetition(thread_cert.TestCase): 'name': 'LEADER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, COMMISSIONER: { 'name': 'COMMISSIONER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_01_MGMTCommissionerGet.py b/tests/scripts/thread-cert/Cert_9_2_01_MGMTCommissionerGet.py index 0c8d31452..a2ea7c0d1 100755 --- a/tests/scripts/thread-cert/Cert_9_2_01_MGMTCommissionerGet.py +++ b/tests/scripts/thread-cert/Cert_9_2_01_MGMTCommissionerGet.py @@ -62,15 +62,11 @@ class Cert_9_2_01_MGMTCommissionerGet(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, } 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 fde40079c..9d35f3f0b 100755 --- a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py +++ b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py @@ -63,15 +63,11 @@ class Cert_9_2_02_MGMTCommissionerSet(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_03_ActiveDatasetGet.py b/tests/scripts/thread-cert/Cert_9_2_03_ActiveDatasetGet.py index fb12027dd..48d932cf3 100755 --- a/tests/scripts/thread-cert/Cert_9_2_03_ActiveDatasetGet.py +++ b/tests/scripts/thread-cert/Cert_9_2_03_ActiveDatasetGet.py @@ -63,15 +63,11 @@ class Cert_9_2_03_ActiveDatasetGet(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py b/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py index f78dcd8ce..21ee91b6e 100755 --- a/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py +++ b/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py @@ -46,22 +46,18 @@ class Cert_9_2_04_ActiveDataset(thread_cert.TestCase): 'name': 'COMMISSIONER', 'active_dataset': { 'timestamp': 10, - 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff' }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'active_dataset': { 'timestamp': 10, - 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff' }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_05_ActiveDataset.py b/tests/scripts/thread-cert/Cert_9_2_05_ActiveDataset.py index a32d6206b..0f8c47c46 100755 --- a/tests/scripts/thread-cert/Cert_9_2_05_ActiveDataset.py +++ b/tests/scripts/thread-cert/Cert_9_2_05_ActiveDataset.py @@ -60,19 +60,15 @@ class Cert_9_2_05_ActiveDataset(thread_cert.TestCase): ROUTER: { 'name': 'ROUTER', 'channel': 11, - 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'channel': 11, - 'panid': 0xface, 'master_key': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [ROUTER] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_06_DatasetDissemination.py b/tests/scripts/thread-cert/Cert_9_2_06_DatasetDissemination.py index 8f7a3a64c..5c7e301b4 100755 --- a/tests/scripts/thread-cert/Cert_9_2_06_DatasetDissemination.py +++ b/tests/scripts/thread-cert/Cert_9_2_06_DatasetDissemination.py @@ -100,7 +100,6 @@ class Cert_9_2_06_DatasetDissemination(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -111,7 +110,6 @@ class Cert_9_2_06_DatasetDissemination(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER] }, ROUTER: { @@ -122,7 +120,6 @@ class Cert_9_2_06_DatasetDissemination(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, MED, SED] }, MED: { 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 035bbb30e..379523b03 100755 --- a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py +++ b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py @@ -59,24 +59,18 @@ class Cert_9_2_7_DelayTimer(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, ROUTER: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, 'partition_id': 1, - 'router_selection_jitter': 1 }, } 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 2c70e5bc8..489438804 100755 --- a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py +++ b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py @@ -81,7 +81,6 @@ class Cert_9_2_8_PersistentDatasets_Base(thread_cert.TestCase): 'mode': 'rdn', 'panid': PANID_INIT, 'channel': CHANNEL_INIT, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -332,7 +331,6 @@ class Cert_9_2_8_PersistentDatasets_Base(thread_cert.TestCase): class Cert_9_2_8_PersistentDatasets_ROUTER(Cert_9_2_8_PersistentDatasets_Base): TOPOLOGY = copy.deepcopy(Cert_9_2_8_PersistentDatasets_Base.TOPOLOGY) TOPOLOGY[DUT]['mode'] = 'rdn' - TOPOLOGY[DUT]['router_selection_jitter'] = 1 class Cert_9_2_8_PersistentDatasets_ED(Cert_9_2_8_PersistentDatasets_Base): 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 9ca0a1065..4f2d9284a 100755 --- a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py @@ -93,7 +93,6 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -105,7 +104,6 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): }, 'mode': 'rdn', 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { @@ -116,7 +114,6 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { @@ -128,7 +125,6 @@ class Cert_9_2_09_PendingPartition(thread_cert.TestCase): }, 'mode': 'rdn', 'network_id_timeout': 70, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py index 4c23013ef..3479a9ba2 100755 --- a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py @@ -57,34 +57,28 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'name': 'COMMISSIONER', 'active_dataset': { 'timestamp': 15, - 'panid': 0xface, 'channel': 19 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'active_dataset': { 'timestamp': 15, - 'panid': 0xface, 'channel': 19 }, 'mode': 'rdn', 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'active_dataset': { 'timestamp': 15, - 'panid': 0xface, 'channel': 19 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { @@ -92,7 +86,6 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'channel': 19, 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, SED1: { @@ -100,7 +93,6 @@ class Cert_9_2_10_PendingPartition(thread_cert.TestCase): 'channel': 19, 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER1] }, diff --git a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py index c28e9d23c..e32a23974 100755 --- a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py +++ b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py @@ -88,7 +88,6 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'master_key': KEY1 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -100,7 +99,6 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'master_key': KEY1 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { @@ -112,7 +110,6 @@ class Cert_9_2_11_MasterKey(thread_cert.TestCase): 'master_key': KEY1 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { 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 332da01af..ec2d4f224 100755 --- a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py +++ b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py @@ -69,7 +69,6 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'channel': DATASET1_CHANNEL }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER1, LEADER2] }, LEADER2: { @@ -80,7 +79,6 @@ class Cert_9_2_12_Announce(thread_cert.TestCase): 'channel': DATASET2_CHANNEL }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [MED, ROUTER1] }, MED: { 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 48d5387e9..667610e37 100755 --- a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py +++ b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py @@ -48,25 +48,19 @@ class Cert_9_2_13_EnergyScan_Base(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { - 'panid': 0xface, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py index 52582cc95..bc2c0e074 100755 --- a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py +++ b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py @@ -46,21 +46,16 @@ class Cert_9_2_14_PanIdQuery(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER1] }, LEADER1: { 'name': 'LEADER_1', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER1, LEADER2] }, LEADER2: { 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 654393e15..bde7ce2f6 100755 --- a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py @@ -56,7 +56,6 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -68,7 +67,6 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): }, 'mode': 'rdn', 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { @@ -79,7 +77,6 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { @@ -90,7 +87,6 @@ class Cert_9_2_15_PendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py index 07a8df6bb..df3026164 100755 --- a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py @@ -57,7 +57,6 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -69,7 +68,6 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): }, 'mode': 'rdn', 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { @@ -80,7 +78,6 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { @@ -91,7 +88,6 @@ class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): 'channel': CHANNEL_INIT }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py index d2f58c802..c9faea130 100755 --- a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py +++ b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py @@ -57,7 +57,6 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): 'channel_mask': CHANNEL_MASK }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [ED1] }, LEADER2: { @@ -69,7 +68,6 @@ class Cert_9_2_17_Orphan(thread_cert.TestCase): 'channel_mask': CHANNEL_MASK }, 'mode': 'rdn', - 'router_selection_jitter': 1 }, ED1: { 'name': 'ED', 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 d2d30b6b3..5c835231f 100755 --- a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py +++ b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py @@ -63,7 +63,6 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'master_key': KEY1 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { @@ -76,7 +75,6 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): }, 'mode': 'rdn', 'partition_id': 0xffffffff, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER, ROUTER1] }, ROUTER1: { @@ -88,7 +86,6 @@ class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): 'master_key': KEY1 }, 'mode': 'rdn', - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { diff --git a/tests/scripts/thread-cert/Cert_9_2_19_PendingDatasetGet.py b/tests/scripts/thread-cert/Cert_9_2_19_PendingDatasetGet.py index 023235506..814d2b167 100755 --- a/tests/scripts/thread-cert/Cert_9_2_19_PendingDatasetGet.py +++ b/tests/scripts/thread-cert/Cert_9_2_19_PendingDatasetGet.py @@ -62,15 +62,11 @@ class Cert_9_2_19_PendingDatasetGet(thread_cert.TestCase): COMMISSIONER: { 'name': 'COMMISSIONER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, LEADER: { 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [COMMISSIONER] }, } diff --git a/tests/scripts/thread-cert/Test_MacScan.py b/tests/scripts/thread-cert/Test_MacScan.py index 19aa4e82a..bdc622894 100755 --- a/tests/scripts/thread-cert/Test_MacScan.py +++ b/tests/scripts/thread-cert/Test_MacScan.py @@ -42,14 +42,12 @@ class Test_MacScan(thread_cert.TestCase): 'channel': 12, 'mode': 'rdn', 'network_name': 'OpenThread', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'channel': 12, 'mode': 'rdn', 'network_name': 'OpenThread', - 'panid': 0xface, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/backbone/bbr_5_11_01.py b/tests/scripts/thread-cert/backbone/bbr_5_11_01.py index 17cebbd14..d0adf5948 100755 --- a/tests/scripts/thread-cert/backbone/bbr_5_11_01.py +++ b/tests/scripts/thread-cert/backbone/bbr_5_11_01.py @@ -57,19 +57,16 @@ class BBR_5_11_01(thread_cert.TestCase): 'allowlist': [ROUTER1, ROUTER2], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER1: { 'name': 'Router_1', 'allowlist': [ROUTER2, BR_1], 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER2: { 'name': 'Router_2', 'allowlist': [ROUTER1, BR_1], 'version': '1.2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/backbone/test_bmlr.py b/tests/scripts/thread-cert/backbone/test_bmlr.py index 6889e33c0..1d2ccce8e 100644 --- a/tests/scripts/thread-cert/backbone/test_bmlr.py +++ b/tests/scripts/thread-cert/backbone/test_bmlr.py @@ -66,26 +66,22 @@ class BBR_5_11_01(thread_cert.TestCase): 'allowlist': [SBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, SBBR: { 'name': 'SBBR', 'allowlist': [PBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER1: { 'name': 'ROUTER1', 'allowlist': [PBBR, SBBR, COMMISSIONER], 'version': '1.2', - 'router_selection_jitter': 1, }, COMMISSIONER: { 'name': 'COMMISSIONER', 'allowlist': [ROUTER1], 'version': '1.2', - 'router_selection_jitter': 1, } } diff --git a/tests/scripts/thread-cert/backbone/test_dua_dad.py b/tests/scripts/thread-cert/backbone/test_dua_dad.py index 049444228..9239978d0 100644 --- a/tests/scripts/thread-cert/backbone/test_dua_dad.py +++ b/tests/scripts/thread-cert/backbone/test_dua_dad.py @@ -78,7 +78,6 @@ class TestDuaDad(thread_cert.TestCase): 'allowlist': [SBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, 'prefer_router_id': 0x1, # Use prefer_router_id to avoid Router ID conflicts in the two channels. }, @@ -87,7 +86,6 @@ class TestDuaDad(thread_cert.TestCase): 'allowlist': [PBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, 'prefer_router_id': 0x2, }, @@ -95,7 +93,6 @@ class TestDuaDad(thread_cert.TestCase): 'name': 'ROUTER1', 'allowlist': [PBBR, SBBR], 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, 'prefer_router_id': 0x3, }, @@ -107,14 +104,12 @@ class TestDuaDad(thread_cert.TestCase): 'name': 'PBBR2', 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH2, 'prefer_router_id': 0x4, }, ROUTER2: { 'name': 'ROUTER2', 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH2, 'prefer_router_id': 0x5, }, diff --git a/tests/scripts/thread-cert/backbone/test_dua_routing.py b/tests/scripts/thread-cert/backbone/test_dua_routing.py index 6affc3bfa..11cd8e5e0 100644 --- a/tests/scripts/thread-cert/backbone/test_dua_routing.py +++ b/tests/scripts/thread-cert/backbone/test_dua_routing.py @@ -69,7 +69,6 @@ class TestNdProxy(thread_cert.TestCase): 'allowlist': [SBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, }, SBBR: { @@ -77,14 +76,12 @@ class TestNdProxy(thread_cert.TestCase): 'allowlist': [PBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, }, ROUTER1: { 'name': 'ROUTER1', 'allowlist': [PBBR, SBBR], 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, }, HOST: { @@ -95,13 +92,11 @@ class TestNdProxy(thread_cert.TestCase): 'name': 'PBBR2', 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH2, }, ROUTER2: { 'name': 'ROUTER2', 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH2, }, } diff --git a/tests/scripts/thread-cert/backbone/test_mle_must_not_send_icmpv6_destination_unreachable.py b/tests/scripts/thread-cert/backbone/test_mle_must_not_send_icmpv6_destination_unreachable.py index 8780c7b6e..bb6d09c57 100644 --- a/tests/scripts/thread-cert/backbone/test_mle_must_not_send_icmpv6_destination_unreachable.py +++ b/tests/scripts/thread-cert/backbone/test_mle_must_not_send_icmpv6_destination_unreachable.py @@ -53,13 +53,11 @@ class TestMleMustNotSendIcmpv6DestinationUnreachable(thread_cert.TestCase): 'allowlist': [ROUTER], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER: { 'name': 'ROUTER', 'allowlist': [PBBR], 'version': '1.2', - 'router_selection_jitter': 1, }, } diff --git a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing.py b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing.py index 289bc104f..cd8cb709e 100644 --- a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing.py +++ b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing.py @@ -79,7 +79,6 @@ class TestMlr(thread_cert.TestCase): 'allowlist': [SBBR, ROUTER, LEADER], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'bbr_registration_jitter': BBR_REGISTRATION_JITTER, }, SBBR: { @@ -87,20 +86,17 @@ class TestMlr(thread_cert.TestCase): 'allowlist': [PBBR, ROUTER, LEADER], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'bbr_registration_jitter': BBR_REGISTRATION_JITTER, }, ROUTER: { 'name': 'ROUTER', 'allowlist': [PBBR, SBBR, LEADER, FED, MED, SED], 'version': '1.2', - 'router_selection_jitter': 1, }, LEADER: { 'name': 'LEADER', 'allowlist': [PBBR, SBBR, ROUTER], 'version': '1.2', - 'router_selection_jitter': 1, }, FED: { 'name': 'FED', diff --git a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_across_thread_pans.py b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_across_thread_pans.py index dc87e949e..1abb932f8 100644 --- a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_across_thread_pans.py +++ b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_across_thread_pans.py @@ -66,7 +66,6 @@ class TestMlr(thread_cert.TestCase): 'allowlist': [ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'bbr_registration_jitter': BBR_REGISTRATION_JITTER, 'channel': CH1, }, @@ -74,7 +73,6 @@ class TestMlr(thread_cert.TestCase): 'name': 'ROUTER1', 'allowlist': [PBBR1], 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH1, }, PBBR2: { @@ -82,7 +80,6 @@ class TestMlr(thread_cert.TestCase): 'allowlist': [ROUTER2], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'bbr_registration_jitter': BBR_REGISTRATION_JITTER, 'channel': CH2, }, @@ -90,7 +87,6 @@ class TestMlr(thread_cert.TestCase): 'name': 'ROUTER2', 'allowlist': [PBBR2], 'version': '1.2', - 'router_selection_jitter': 1, 'channel': CH2, }, HOST: { diff --git a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_timeout.py b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_timeout.py index 3cdd80c45..a443ede7b 100644 --- a/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_timeout.py +++ b/tests/scripts/thread-cert/backbone/test_mlr_multicast_routing_timeout.py @@ -62,14 +62,12 @@ class TestMlrTimeout(thread_cert.TestCase): 'allowlist': [ROUTER], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, 'bbr_registration_jitter': BBR_REGISTRATION_JITTER, }, ROUTER: { 'name': 'ROUTER', 'allowlist': [PBBR], 'version': '1.2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/backbone/test_ndproxy.py b/tests/scripts/thread-cert/backbone/test_ndproxy.py index 1e5b7c62e..dbb227467 100644 --- a/tests/scripts/thread-cert/backbone/test_ndproxy.py +++ b/tests/scripts/thread-cert/backbone/test_ndproxy.py @@ -64,20 +64,17 @@ class TestNdProxy(thread_cert.TestCase): 'allowlist': [SBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, SBBR: { 'name': 'SBBR', 'allowlist': [PBBR, ROUTER1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER1: { 'name': 'ROUTER1', 'allowlist': [PBBR, SBBR], 'version': '1.2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'HOST', diff --git a/tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py b/tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py index 559cc233e..51df58ba1 100644 --- a/tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py +++ b/tests/scripts/thread-cert/border_router/MATN_02_MLRFirstUse.py @@ -72,20 +72,17 @@ class MATN_02_MLRFirstUse(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, TD], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'allowlist': [BR_1, TD], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 2, }, TD: { 'name': 'TD', 'allowlist': [BR_1, BR_2], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py b/tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py index a2d670703..272f79408 100644 --- a/tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py +++ b/tests/scripts/thread-cert/border_router/MATN_03_InvalidCommissionerDeregistration.py @@ -65,20 +65,17 @@ class MATN_03_InvalidCommissionerDeregistration(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'allowlist': [BR_1, ROUTER_1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1, BR_2], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py b/tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py index 80c96315b..b24a708ad 100644 --- a/tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py +++ b/tests/scripts/thread-cert/border_router/MATN_04_MulticastListenerTimeout.py @@ -68,20 +68,17 @@ class MATN_04_MulticastListenerTimeout(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'allowlist': [BR_1, ROUTER_1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1, BR_2], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py b/tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py index b7d02035d..7eaa590a4 100644 --- a/tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py +++ b/tests/scripts/thread-cert/border_router/MATN_05_ReregistrationToSameMulticastGroup.py @@ -69,20 +69,17 @@ class MATN_05_ReregistrationToSameMulticastGroup(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'allowlist': [BR_1, ROUTER_1], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1, BR_2], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py b/tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py index 65a1223be..3f2bf08cf 100644 --- a/tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py +++ b/tests/scripts/thread-cert/border_router/MATN_09_DefaultBRMulticastForwarding.py @@ -65,20 +65,17 @@ class MATN_09_FailureOfPrimaryBBROutboundMulticast(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'is_otbr': True, 'allowlist': [BR_1, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1, BR_2], 'version': '1.2', - 'router_selection_jitter': 2, 'partition_id': 1, 'network_id_timeout': 150, }, diff --git a/tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py b/tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py index 59764e448..cf11ddd78 100644 --- a/tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py +++ b/tests/scripts/thread-cert/border_router/MATN_12_HopLimitProcessing.py @@ -67,13 +67,11 @@ class MATN_12_HopLimitProcessing(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py b/tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py index 0900417cf..e7ada1fef 100644 --- a/tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py +++ b/tests/scripts/thread-cert/border_router/MATN_15_ChangeOfPrimaryBBRTriggersRegistration.py @@ -76,27 +76,23 @@ class MATN_15_ChangeOfPrimaryBBRTriggersRegistration(thread_cert.TestCase): 'is_otbr': True, 'allowlist': [BR_2, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, BR_2: { 'name': 'BR_2', 'is_otbr': True, 'allowlist': [BR_1, ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1, BR_2, TD], 'version': '1.2', - 'router_selection_jitter': 2, 'partition_id': 1, }, TD: { 'name': 'TD', 'allowlist': [ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, 'partition_id': 1, }, } diff --git a/tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py b/tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py index 5ead0fc1b..749a741cb 100644 --- a/tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py +++ b/tests/scripts/thread-cert/border_router/MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR.py @@ -72,13 +72,11 @@ class MATN_16_LargeNumberOfMulticastGroupSubscriptionsToBBR(thread_cert.TestCase 'is_otbr': True, 'allowlist': [ROUTER_1], 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER_1: { 'name': 'Router_1', 'allowlist': [BR_1], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/test_advertising_proxy.py b/tests/scripts/thread-cert/border_router/test_advertising_proxy.py index 28e093e36..0944148e8 100755 --- a/tests/scripts/thread-cert/border_router/test_advertising_proxy.py +++ b/tests/scripts/thread-cert/border_router/test_advertising_proxy.py @@ -60,13 +60,11 @@ class SingleHostAndService(thread_cert.TestCase): 'allowlist': [ROUTER], 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 2, }, ROUTER: { 'name': 'Router_1', 'allowlist': [BR], 'version': '1.2', - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/test_dnssd_server.py b/tests/scripts/thread-cert/border_router/test_dnssd_server.py index 0f7702ca2..69d4046af 100644 --- a/tests/scripts/thread-cert/border_router/test_dnssd_server.py +++ b/tests/scripts/thread-cert/border_router/test_dnssd_server.py @@ -73,15 +73,12 @@ class TestDnssdServerOnBr(thread_cert.TestCase): 'name': 'SERVER', 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, CLIENT1: { 'name': 'CLIENT1', - 'router_selection_jitter': 1, }, CLIENT2: { 'name': 'CLIENT2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/test_multi_border_routers.py b/tests/scripts/thread-cert/border_router/test_multi_border_routers.py index f67d49bbe..18a4941f4 100755 --- a/tests/scripts/thread-cert/border_router/test_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/test_multi_border_routers.py @@ -64,14 +64,12 @@ class MultiBorderRouters(thread_cert.TestCase): 'is_otbr': True, 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 2, }, ROUTER1: { 'name': 'Router_1', 'allowlist': [BR1], 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 2, }, BR2: { 'name': 'BR_2', @@ -79,14 +77,12 @@ class MultiBorderRouters(thread_cert.TestCase): 'is_otbr': True, 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 2, }, ROUTER2: { 'name': 'Router_2', 'allowlist': [BR2], 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 2, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py b/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py index a05432da8..79b88b373 100755 --- a/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py +++ b/tests/scripts/thread-cert/border_router/test_multi_thread_networks.py @@ -64,14 +64,12 @@ class MultiThreadNetworks(thread_cert.TestCase): 'is_otbr': True, 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 1, }, ROUTER1: { 'name': 'Router_1', 'allowlist': [BR1], 'version': '1.2', 'channel': CHANNEL1, - 'router_selection_jitter': 1, }, BR2: { 'name': 'BR_2', @@ -79,14 +77,12 @@ class MultiThreadNetworks(thread_cert.TestCase): 'is_otbr': True, 'version': '1.2', 'channel': CHANNEL2, - 'router_selection_jitter': 1, }, ROUTER2: { 'name': 'Router_2', 'allowlist': [BR2], 'version': '1.2', 'channel': CHANNEL2, - 'router_selection_jitter': 1, }, } diff --git a/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py b/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py index 180e70cb4..fdc65e884 100644 --- a/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py +++ b/tests/scripts/thread-cert/border_router/test_plat_udp_accessiblity.py @@ -55,12 +55,10 @@ class TestPlatUdpAccessibility(thread_cert.TestCase): 'name': 'BR_1', 'is_otbr': True, 'version': '1.2', - 'router_selection_jitter': 1, }, ROUTER1: { 'name': 'Router_1', 'version': '1.2', - 'router_selection_jitter': 1, }, } diff --git a/tests/scripts/thread-cert/border_router/test_radvd_coexist.py b/tests/scripts/thread-cert/border_router/test_radvd_coexist.py index 053c0785d..a201a9fb8 100755 --- a/tests/scripts/thread-cert/border_router/test_radvd_coexist.py +++ b/tests/scripts/thread-cert/border_router/test_radvd_coexist.py @@ -67,7 +67,6 @@ class SingleBorderRouter(thread_cert.TestCase): 'name': 'Router', 'allowlist': [BR], 'version': '1.2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/border_router/test_single_border_router.py b/tests/scripts/thread-cert/border_router/test_single_border_router.py index 3dab4e197..b26c28b32 100755 --- a/tests/scripts/thread-cert/border_router/test_single_border_router.py +++ b/tests/scripts/thread-cert/border_router/test_single_border_router.py @@ -68,7 +68,6 @@ class SingleBorderRouter(thread_cert.TestCase): 'name': 'Router', 'allowlist': [BR], 'version': '1.2', - 'router_selection_jitter': 1, }, HOST: { 'name': 'Host', diff --git a/tests/scripts/thread-cert/config.py b/tests/scripts/thread-cert/config.py index 9cc18f09c..f429fad1f 100644 --- a/tests/scripts/thread-cert/config.py +++ b/tests/scripts/thread-cert/config.py @@ -139,6 +139,7 @@ VIRTUAL_TIME = int(os.getenv('VIRTUAL_TIME', 0)) PARENT_AGGREGATIOIN_DELAY = 5 DUA_DAD_DELAY = 5 DEFAULT_BBR_REGISTRATION_JITTER = 2 +DEFAULT_ROUTER_SELECTION_JITTER = 1 LEADER_NOTIFY_SED_BY_CHILD_UPDATE_REQUEST = True diff --git a/tests/scripts/thread-cert/test_anycast.py b/tests/scripts/thread-cert/test_anycast.py index 41c100073..70b50dfcb 100755 --- a/tests/scripts/thread-cert/test_anycast.py +++ b/tests/scripts/thread-cert/test_anycast.py @@ -49,32 +49,22 @@ class TestAnycast(thread_cert.TestCase): TOPOLOGY = { ROUTER1: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER2], }, ROUTER2: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1, ROUTER3], }, ROUTER3: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER2, ROUTER4], }, ROUTER4: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER3, ROUTER5], }, ROUTER5: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER4], }, } diff --git a/tests/scripts/thread-cert/test_coap_block.py b/tests/scripts/thread-cert/test_coap_block.py index 27c98bf82..0bc1333c4 100755 --- a/tests/scripts/thread-cert/test_coap_block.py +++ b/tests/scripts/thread-cert/test_coap_block.py @@ -47,13 +47,10 @@ class TestCoapBlockTransfer(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'whitelist': [ROUTER] }, ROUTER: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'whitelist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_coap_observe.py b/tests/scripts/thread-cert/test_coap_observe.py index cab7445cf..13bfa8f6c 100755 --- a/tests/scripts/thread-cert/test_coap_observe.py +++ b/tests/scripts/thread-cert/test_coap_observe.py @@ -47,13 +47,10 @@ class TestCoapObserve(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_coaps.py b/tests/scripts/thread-cert/test_coaps.py index d678ec049..46b43ae76 100755 --- a/tests/scripts/thread-cert/test_coaps.py +++ b/tests/scripts/thread-cert/test_coaps.py @@ -42,13 +42,10 @@ class TestCoaps(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_dataset_updater.py b/tests/scripts/thread-cert/test_dataset_updater.py index 10a852720..0ce709d23 100755 --- a/tests/scripts/thread-cert/test_dataset_updater.py +++ b/tests/scripts/thread-cert/test_dataset_updater.py @@ -46,24 +46,19 @@ class TestDatasetUpdater(thread_cert.TestCase): LEADER: { 'mode': 'rdn', 'channel': 11, - 'panid': 0xface, }, ROUTER: { 'mode': 'rdn', 'channel': 11, - 'panid': 0xface, - 'router_selection_jitter': 1, }, MED: { 'mode': 'rn', 'channel': 11, - 'panid': 0xface, 'allowlist': [ROUTER], }, SED: { 'mode': '-', 'channel': 11, - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER], }, diff --git a/tests/scripts/thread-cert/test_dnssd.py b/tests/scripts/thread-cert/test_dnssd.py index d4b80d68f..6a12efb0e 100755 --- a/tests/scripts/thread-cert/test_dnssd.py +++ b/tests/scripts/thread-cert/test_dnssd.py @@ -54,17 +54,12 @@ class TestDnssd(thread_cert.TestCase): TOPOLOGY = { SERVER: { 'mode': 'rdn', - 'panid': 0xface, }, CLIENT1: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, }, CLIENT2: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, }, } diff --git a/tests/scripts/thread-cert/test_ipv6_fragmentation.py b/tests/scripts/thread-cert/test_ipv6_fragmentation.py index c7b565d62..2b5d8e22c 100755 --- a/tests/scripts/thread-cert/test_ipv6_fragmentation.py +++ b/tests/scripts/thread-cert/test_ipv6_fragmentation.py @@ -49,7 +49,6 @@ class TestIPv6Fragmentation(thread_cert.TestCase): ROUTER: { 'mode': 'rdn', 'panid': 0xcafe, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_ipv6_source_selection.py b/tests/scripts/thread-cert/test_ipv6_source_selection.py index e32e37dc9..abaa7b127 100755 --- a/tests/scripts/thread-cert/test_ipv6_source_selection.py +++ b/tests/scripts/thread-cert/test_ipv6_source_selection.py @@ -48,7 +48,6 @@ class TestIPv6SourceSelection(thread_cert.TestCase): ROUTER: { 'mode': 'rdn', 'panid': 0xcafe, - 'router_selection_jitter': 1, 'allowlist': [LEADER] }, } diff --git a/tests/scripts/thread-cert/test_on_mesh_prefix.py b/tests/scripts/thread-cert/test_on_mesh_prefix.py index 5e40498d9..16a359711 100755 --- a/tests/scripts/thread-cert/test_on_mesh_prefix.py +++ b/tests/scripts/thread-cert/test_on_mesh_prefix.py @@ -44,25 +44,20 @@ class Test_OnMeshPrefix(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED1, SED1] }, ED1: { 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, SED1: { 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'timeout': config.DEFAULT_CHILD_TIMEOUT, 'allowlist': [ROUTER] }, diff --git a/tests/scripts/thread-cert/test_pbbr_aloc.py b/tests/scripts/thread-cert/test_pbbr_aloc.py index be55cb63f..312681a55 100755 --- a/tests/scripts/thread-cert/test_pbbr_aloc.py +++ b/tests/scripts/thread-cert/test_pbbr_aloc.py @@ -57,18 +57,15 @@ class TestPing(thread_cert.TestCase): LEADER: { 'name': 'Router_1', 'allowlist': [PBBR, ROUTER], - 'router_selection_jitter': 2, }, PBBR: { 'name': 'Router_2', 'allowlist': [LEADER], - 'router_selection_jitter': 2, 'is_bbr': True, }, ROUTER: { 'name': 'Router_3', 'allowlist': [LEADER], - 'router_selection_jitter': 2, }, } diff --git a/tests/scripts/thread-cert/test_ping.py b/tests/scripts/thread-cert/test_ping.py index ecdf7ce3a..13ee63549 100755 --- a/tests/scripts/thread-cert/test_ping.py +++ b/tests/scripts/thread-cert/test_ping.py @@ -59,17 +59,14 @@ class TestPing(thread_cert.TestCase): ROUTER_1: { 'name': 'Router_1', 'allowlist': [ROUTER_2, ROUTER_3], - 'router_selection_jitter': 2, }, ROUTER_2: { 'name': 'Router_2', 'allowlist': [ROUTER_1], - 'router_selection_jitter': 2, }, ROUTER_3: { 'name': 'Router_3', 'allowlist': [ROUTER_1], - 'router_selection_jitter': 2, }, } diff --git a/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py b/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py index 0b1aa02ff..e1f36b353 100755 --- a/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py +++ b/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py @@ -52,12 +52,9 @@ class TestREEDAddressSolicitRejected(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface }, REED: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/test_reset.py b/tests/scripts/thread-cert/test_reset.py index 155c97a97..7c6305f8e 100755 --- a/tests/scripts/thread-cert/test_reset.py +++ b/tests/scripts/thread-cert/test_reset.py @@ -41,19 +41,15 @@ class TestReset(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER] }, ROUTER: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ED] }, ED: { 'is_mtd': True, 'mode': 'rn', - 'panid': 0xface, 'allowlist': [ROUTER] }, } diff --git a/tests/scripts/thread-cert/test_route_table.py b/tests/scripts/thread-cert/test_route_table.py index a8965f247..733355994 100755 --- a/tests/scripts/thread-cert/test_route_table.py +++ b/tests/scripts/thread-cert/test_route_table.py @@ -46,19 +46,14 @@ class TestRouteTable(thread_cert.TestCase): TOPOLOGY = { LEADER: { 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER1] }, ROUTER1: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [ROUTER1] }, } diff --git a/tests/scripts/thread-cert/test_router_reattach.py b/tests/scripts/thread-cert/test_router_reattach.py index d20413f37..154a710df 100755 --- a/tests/scripts/thread-cert/test_router_reattach.py +++ b/tests/scripts/thread-cert/test_router_reattach.py @@ -37,226 +37,162 @@ class test_router_reattach(thread_cert.TestCase): TOPOLOGY = { 1: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 2: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 3: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 4: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 5: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 6: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 7: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 8: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 9: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 10: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 11: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 12: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 13: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 14: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 15: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 16: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 17: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 18: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 19: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 20: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 21: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 22: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 23: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 24: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 25: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 26: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 27: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 28: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 29: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 30: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 31: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, 32: { 'mode': 'rdn', - 'panid': 0xface, 'router_downgrade_threshold': 32, - 'router_selection_jitter': 1, 'router_upgrade_threshold': 32 }, } diff --git a/tests/scripts/thread-cert/test_service.py b/tests/scripts/thread-cert/test_service.py index bdafc0923..4be617eb9 100755 --- a/tests/scripts/thread-cert/test_service.py +++ b/tests/scripts/thread-cert/test_service.py @@ -56,23 +56,18 @@ class Test_Service(thread_cert.TestCase): 'channel': 12, 'mode': 'rdn', 'network_name': 'OpenThread', - 'panid': 0xface, 'allowlist': [ROUTER1, ROUTER2] }, ROUTER1: { 'channel': 12, 'mode': 'rdn', 'network_name': 'OpenThread', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER2] }, ROUTER2: { 'channel': 12, 'mode': 'rdn', 'network_name': 'OpenThread', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, ROUTER1] }, } diff --git a/tests/scripts/thread-cert/test_srp_auto_start_mode.py b/tests/scripts/thread-cert/test_srp_auto_start_mode.py index 1a28397a1..14b25cdf2 100755 --- a/tests/scripts/thread-cert/test_srp_auto_start_mode.py +++ b/tests/scripts/thread-cert/test_srp_auto_start_mode.py @@ -59,21 +59,16 @@ class SrpAutoStartMode(thread_cert.TestCase): 'name': 'SRP_CLIENT', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, SERVER1: { 'name': 'SRP_SERVER1', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, SERVER2: { 'name': 'SRP_SERVER2', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/test_srp_lease.py b/tests/scripts/thread-cert/test_srp_lease.py index baf45af14..63d8d823f 100755 --- a/tests/scripts/thread-cert/test_srp_lease.py +++ b/tests/scripts/thread-cert/test_srp_lease.py @@ -59,14 +59,11 @@ class SrpRegisterSingleService(thread_cert.TestCase): 'name': 'SRP_SERVER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, CLIENT: { 'name': 'SRP_CLIENT', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/test_srp_name_conflicts.py b/tests/scripts/thread-cert/test_srp_name_conflicts.py index 1e2851891..54a853697 100755 --- a/tests/scripts/thread-cert/test_srp_name_conflicts.py +++ b/tests/scripts/thread-cert/test_srp_name_conflicts.py @@ -58,21 +58,16 @@ class SrpNameConflicts(thread_cert.TestCase): 'name': 'SRP_SERVER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, CLIENT1: { 'name': 'SRP_CLIENT1', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, CLIENT2: { 'name': 'SRP_CLIENT2', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/test_srp_register_single_service.py b/tests/scripts/thread-cert/test_srp_register_single_service.py index 6241cac0c..9e36de09a 100755 --- a/tests/scripts/thread-cert/test_srp_register_single_service.py +++ b/tests/scripts/thread-cert/test_srp_register_single_service.py @@ -57,14 +57,11 @@ class SrpRegisterSingleService(thread_cert.TestCase): 'name': 'SRP_SERVER', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface }, CLIENT: { 'name': 'SRP_CLIENT', 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1 }, } diff --git a/tests/scripts/thread-cert/thread_cert.py b/tests/scripts/thread-cert/thread_cert.py index eb0d5186f..c2b853dc8 100644 --- a/tests/scripts/thread-cert/thread_cert.py +++ b/tests/scripts/thread-cert/thread_cert.py @@ -56,16 +56,22 @@ ENV_THREAD_VERSION = os.getenv('THREAD_VERSION', '1.1') DEFAULT_PARAMS = { 'is_mtd': False, + 'is_ftd': False, 'is_bbr': False, 'is_otbr': False, 'is_host': False, 'mode': 'rdn', - 'panid': 0xface, 'allowlist': None, 'version': ENV_THREAD_VERSION, + 'panid': 0xface, } """Default configurations when creating nodes.""" +FTD_DEFAULT_PARAMS = { + 'is_ftd': True, + 'router_selection_jitter': config.DEFAULT_ROUTER_SELECTION_JITTER, +} + EXTENDED_ADDRESS_BASE = 0x166e0a0000000000 """Extended address base to keep U/L bit 1. The value is borrowed from Thread Test Harness.""" @@ -175,8 +181,9 @@ class TestCase(NcpSupportMixin, unittest.TestCase): if 'network_name' in params: self.nodes[i].set_network_name(params['network_name']) - if 'router_selection_jitter' in params: + if params['is_ftd']: self.nodes[i].set_router_selection_jitter(params['router_selection_jitter']) + if 'router_upgrade_threshold' in params: self.nodes[i].set_router_upgrade_threshold(params['router_upgrade_threshold']) if 'router_downgrade_threshold' in params: @@ -431,12 +438,16 @@ class TestCase(NcpSupportMixin, unittest.TestCase): assert params.get('version', '') == '', params params['version'] = '' - if params: - params = dict(DEFAULT_PARAMS, **params) - else: - params = DEFAULT_PARAMS.copy() + is_ftd = (not params.get('is_mtd') and not params.get('is_host')) - return params + effective_params = DEFAULT_PARAMS.copy() + + if is_ftd: + effective_params.update(FTD_DEFAULT_PARAMS) + + effective_params.update(params) + + return effective_params def _has_backbone_traffic(self): for param in self.TOPOLOGY.values(): diff --git a/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py b/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py index 6ef78b27b..ec95f4ccf 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_5_3_01_SSEDAttachment.py @@ -47,15 +47,12 @@ class LowPower_5_3_01_SSEDAttachment(thread_cert.TestCase): 'version': '1.2', 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER, SSED_1] }, ROUTER: { 'version': '1.2', 'name': 'ROUTER', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER], }, SSED_1: { @@ -63,7 +60,6 @@ class LowPower_5_3_01_SSEDAttachment(thread_cert.TestCase): 'name': 'SSED_1', 'is_mtd': True, 'mode': '-', - 'panid': 0xface, 'allowlist': [LEADER], }, } diff --git a/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py b/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py index 9da18f5af..26bd58f88 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_6_1_07_PreferringARouterOverAReed.py @@ -49,29 +49,24 @@ class LowPower_6_1_07_PreferringARouterOverAReed_Base(thread_cert.TestCase): 'version': '1.2', 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [ROUTER_1, REED_1] }, ROUTER_1: { 'version': '1.1', 'name': 'ROUTER_1', 'mode': 'rdn', - 'panid': 0xface, - 'router_selection_jitter': 1, 'allowlist': [LEADER, DUT], }, REED_1: { 'version': '1.2', 'name': 'REED_1', 'mode': 'rdn', - 'panid': 0xface, 'router_upgrade_threshold': 0, 'allowlist': [LEADER, DUT], }, DUT: { 'version': '1.2', 'name': 'DUT', - 'panid': 0xface, 'is_mtd': True, 'allowlist': [ROUTER_1, REED_1], }, diff --git a/tests/scripts/thread-cert/v1_2_LowPower_7_1_01_SingleProbeLinkMetricsWithEnhancedAcks.py b/tests/scripts/thread-cert/v1_2_LowPower_7_1_01_SingleProbeLinkMetricsWithEnhancedAcks.py index e851a3084..c952b1f63 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_7_1_01_SingleProbeLinkMetricsWithEnhancedAcks.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_7_1_01_SingleProbeLinkMetricsWithEnhancedAcks.py @@ -47,21 +47,18 @@ class LowPower_7_1_01(thread_cert.TestCase): 'version': '1.2', 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [SED_1, SSED_1], }, SED_1: { 'version': '1.2', 'name': 'SED_1', 'mode': '-', - 'panid': 0xface, 'allowlist': [LEADER], }, SSED_1: { 'version': '1.2', 'name': 'SSED_1', 'mode': '-', - 'panid': 0xface, 'allowlist': [LEADER], } } diff --git a/tests/scripts/thread-cert/v1_2_LowPower_7_2_01_ForwardTrackingSeries.py b/tests/scripts/thread-cert/v1_2_LowPower_7_2_01_ForwardTrackingSeries.py index 683167f7c..adb1f5efa 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_7_2_01_ForwardTrackingSeries.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_7_2_01_ForwardTrackingSeries.py @@ -52,21 +52,18 @@ class LowPower_7_2_01_ForwardTrackingSeries(thread_cert.TestCase): 'version': '1.2', 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [SED_1, SSED_1], }, SED_1: { 'version': '1.2', 'name': 'SED_1', 'mode': '-', - 'panid': 0xface, 'allowlist': [LEADER], }, SSED_1: { 'version': '1.2', 'name': 'SSED_1', 'mode': '-', - 'panid': 0xface, 'allowlist': [LEADER], } } diff --git a/tests/scripts/thread-cert/v1_2_LowPower_test_forward_tracking_series.py b/tests/scripts/thread-cert/v1_2_LowPower_test_forward_tracking_series.py index c952083e4..ffa7e3fcd 100755 --- a/tests/scripts/thread-cert/v1_2_LowPower_test_forward_tracking_series.py +++ b/tests/scripts/thread-cert/v1_2_LowPower_test_forward_tracking_series.py @@ -50,14 +50,12 @@ class LowPower_test_ForwardTrackingSeries(thread_cert.TestCase): 'version': '1.2', 'name': 'LEADER', 'mode': 'rdn', - 'panid': 0xface, 'allowlist': [CHILD], }, CHILD: { 'version': '1.2', 'name': 'CHILD', 'mode': 'rn', - 'panid': 0xface, 'allowlist': [LEADER], } } diff --git a/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py b/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py index 78cb1da96..60bb2a9e8 100755 --- a/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py +++ b/tests/scripts/thread-cert/v1_2_test_dua_handle_address_error.py @@ -41,7 +41,6 @@ MED = 4 WAIT_ATTACH = 5 WAIT_REDUNDANCE = 3 -ROUTER_SELECTION_JITTER = 1 BBR_REGISTRATION_JITTER = 5 SED_POLL_PERIOD = 2000 # 2s MED_TIMEOUT = 20 # 20s @@ -64,13 +63,11 @@ class TestDomainUnicastAddress(thread_cert.TestCase): BBR_1: { 'version': '1.2', 'allowlist': [ROUTER], - 'router_selection_jitter': ROUTER_SELECTION_JITTER, 'is_bbr': True }, ROUTER: { 'version': '1.2', 'allowlist': [BBR_1, FED, MED], - 'router_selection_jitter': ROUTER_SELECTION_JITTER, }, FED: { 'version': '1.2', @@ -94,7 +91,7 @@ class TestDomainUnicastAddress(thread_cert.TestCase): self.nodes[BBR_1].set_backbone_router(seqno=1, reg_delay=REG_DELAY) self.nodes[BBR_1].start() - self.simulator.go(WAIT_ATTACH + ROUTER_SELECTION_JITTER) + self.simulator.go(WAIT_ATTACH + config.DEFAULT_ROUTER_SELECTION_JITTER) self.assertEqual(self.nodes[BBR_1].get_state(), 'leader') self.nodes[BBR_1].enable_backbone_router() self.simulator.go(BBR_REGISTRATION_JITTER + WAIT_REDUNDANCE) 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 5208ab84b..33193b487 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 @@ -78,23 +78,19 @@ class TestMulticastListenerRegistration(thread_cert.TestCase): 'version': '1.2', 'allowlist': [BBR_2, ROUTER_1_2], 'is_bbr': True, - 'router_selection_jitter': 1, }, BBR_2: { 'version': '1.2', 'allowlist': [BBR_1, ROUTER_1_2, ROUTER_1_1], 'is_bbr': True, - 'router_selection_jitter': 1, }, ROUTER_1_2: { 'version': '1.2', 'allowlist': [BBR_1, BBR_2, SED_1, MED_1, MED_2, FED_1], - 'router_selection_jitter': 1, }, ROUTER_1_1: { 'version': '1.1', 'allowlist': [BBR_2], - 'router_selection_jitter': 1, }, MED_1: { 'mode': 'rn',