From 8e124e6fac366637839fb336508cba712f803ce6 Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Thu, 11 Jun 2020 09:14:59 +0800 Subject: [PATCH] [cert] capitalize python class constants (#5080) According to PEP8, constants should be written in all capital letters. This commit capitalizes these constants: - thread_cert.TestCase.topology - thread_cert.TestCase.support_ncp --- tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py | 2 +- .../thread-cert/Cert_5_1_02_ChildAddressTimeout.py | 2 +- .../thread-cert/Cert_5_1_03_RouterAddressReallocation.py | 2 +- .../thread-cert/Cert_5_1_04_RouterAddressReallocation.py | 2 +- .../thread-cert/Cert_5_1_05_RouterAddressTimeout.py | 2 +- tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py | 2 +- tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py | 2 +- .../thread-cert/Cert_5_1_08_RouterAttachConnectivity.py | 2 +- .../thread-cert/Cert_5_1_09_REEDAttachConnectivity.py | 2 +- .../thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py | 2 +- .../thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py | 2 +- .../thread-cert/Cert_5_1_12_NewRouterNeighborSync.py | 2 +- tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py | 2 +- tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py | 2 +- .../scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py | 2 +- tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py | 2 +- tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py | 2 +- tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py | 2 +- .../thread-cert/Cert_5_2_07_REEDSynchronization.py | 2 +- tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py | 2 +- tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py | 2 +- tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py | 2 +- tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py | 2 +- .../scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py | 2 +- tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py | 2 +- tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py | 2 +- tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py | 2 +- tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py | 2 +- tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py | 2 +- tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py | 4 ++-- .../Cert_5_3_11_AddressQueryTimeoutIntervals.py | 2 +- tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py | 2 +- tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py | 2 +- .../scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py | 2 +- .../scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py | 2 +- tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py | 2 +- .../scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py | 2 +- .../thread-cert/Cert_5_5_08_SplitRoutersLostLeader.py | 2 +- .../Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py | 2 +- .../Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py | 2 +- .../Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py | 2 +- .../Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py | 2 +- .../Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py | 2 +- .../thread-cert/Cert_5_6_06_NetworkDataExpiration.py | 2 +- .../thread-cert/Cert_5_6_07_NetworkDataRequestREED.py | 2 +- .../scripts/thread-cert/Cert_5_6_08_ContextManagement.py | 2 +- .../thread-cert/Cert_5_6_09_NetworkDataForwarding.py | 2 +- .../scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py | 4 ++-- .../scripts/thread-cert/Cert_5_8_01_KeySynchronization.py | 2 +- tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py | 2 +- .../thread-cert/Cert_5_8_03_KeyIncrementRollOver.py | 2 +- tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py | 2 +- tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py | 2 +- tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py | 2 +- .../thread-cert/Cert_6_1_03_RouterAttachConnectivity.py | 2 +- .../thread-cert/Cert_6_1_04_REEDAttachConnectivity.py | 2 +- .../thread-cert/Cert_6_1_05_RouterAttachLinkQuality.py | 2 +- .../thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py | 2 +- .../thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py | 2 +- .../scripts/thread-cert/Cert_6_1_07_EDSynchronization.py | 2 +- tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py | 2 +- tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py | 2 +- tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py | 2 +- .../scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py | 2 +- tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py | 2 +- tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py | 2 +- .../thread-cert/Cert_6_5_01_ChildResetSynchronize.py | 2 +- .../scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py | 2 +- tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py | 2 +- .../thread-cert/Cert_6_6_02_KeyIncrementRollOver.py | 2 +- .../thread-cert/Cert_7_1_01_BorderRouterAsLeader.py | 2 +- .../thread-cert/Cert_7_1_02_BorderRouterAsRouter.py | 2 +- .../thread-cert/Cert_7_1_03_BorderRouterAsLeader.py | 2 +- .../thread-cert/Cert_7_1_04_BorderRouterAsRouter.py | 2 +- .../thread-cert/Cert_7_1_05_BorderRouterAsRouter.py | 2 +- tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py | 4 ++-- tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py | 4 ++-- tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py | 4 ++-- tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py | 4 ++-- .../thread-cert/Cert_9_2_02_MGMTCommissionerSet.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py | 4 ++-- .../scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_12_Announce.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py | 4 ++-- .../thread-cert/Cert_9_2_16_ActivePendingPartition.py | 4 ++-- tests/scripts/thread-cert/Cert_9_2_17_Orphan.py | 4 ++-- .../thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py | 4 ++-- tests/scripts/thread-cert/Test_Cli.py | 2 +- tests/scripts/thread-cert/Test_MacScan.py | 2 +- tests/scripts/thread-cert/test_coap_observe.py | 4 ++-- tests/scripts/thread-cert/test_coaps.py | 4 ++-- tests/scripts/thread-cert/test_diag.py | 4 ++-- tests/scripts/thread-cert/test_ipv6_fragmentation.py | 4 ++-- tests/scripts/thread-cert/test_ipv6_source_selection.py | 4 ++-- .../thread-cert/test_reed_address_solicit_rejected.py | 4 ++-- tests/scripts/thread-cert/test_reset.py | 2 +- tests/scripts/thread-cert/test_route_table.py | 2 +- tests/scripts/thread-cert/test_service.py | 4 ++-- tests/scripts/thread-cert/thread_cert.py | 8 +++++--- tests/scripts/thread-cert/v1_2_router_5_1_1.py | 2 +- .../thread-cert/v1_2_test_backbone_router_service.py | 2 +- .../thread-cert/v1_2_test_domain_unicast_address.py | 2 +- .../thread-cert/v1_2_test_enhanced_frame_pending.py | 2 +- .../scripts/thread-cert/v1_2_test_enhanced_keep_alive.py | 2 +- .../thread-cert/v1_2_test_multicast_registration.py | 2 +- tests/scripts/thread-cert/v1_2_test_parent_selection.py | 2 +- 112 files changed, 143 insertions(+), 141 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 05e9e042f..27f046c45 100755 --- a/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_5_1_01_RouterAttach.py @@ -38,7 +38,7 @@ ROUTER = 2 class Cert_5_1_01_RouterAttach(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 33f3d3e7b..529c344d5 100755 --- a/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_02_ChildAddressTimeout.py @@ -42,7 +42,7 @@ MTDS = [ED, SED] class Cert_5_1_02_ChildAddressTimeout(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 59a71a1cd..de010b6fb 100755 --- a/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_03_RouterAddressReallocation.py @@ -39,7 +39,7 @@ ROUTER2 = 3 class Cert_5_1_03_RouterAddressReallocation(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 327876ba4..fb371c4df 100755 --- a/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py +++ b/tests/scripts/thread-cert/Cert_5_1_04_RouterAddressReallocation.py @@ -39,7 +39,7 @@ ROUTER2 = 3 class Cert_5_1_04_RouterAddressReallocation(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 71e7da489..318ddc86c 100755 --- a/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py +++ b/tests/scripts/thread-cert/Cert_5_1_05_RouterAddressTimeout.py @@ -38,7 +38,7 @@ ROUTER1 = 2 class Cert_5_1_05_RouterAddressTimeout(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 dc5e78a7e..5689e2e30 100755 --- a/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py +++ b/tests/scripts/thread-cert/Cert_5_1_06_RemoveRouterId.py @@ -39,7 +39,7 @@ ROUTER1 = 2 class Cert_5_1_06_RemoveRouterId(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 dcbc927e2..ebb8b68fa 100755 --- a/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py +++ b/tests/scripts/thread-cert/Cert_5_1_07_MaxChildCount.py @@ -38,7 +38,7 @@ SED1 = 7 class Cert_5_1_07_MaxChildCount(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 37cc93c5a..cbf47be47 100755 --- a/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_08_RouterAttachConnectivity.py @@ -41,7 +41,7 @@ ROUTER4 = 5 class Cert_5_1_08_RouterAttachConnectivity(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 33c697682..01aaa5dd7 100755 --- a/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_5_1_09_REEDAttachConnectivity.py @@ -41,7 +41,7 @@ ROUTER2 = 5 class Cert_5_1_09_REEDAttachConnectivity(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 fc55c8d29..dcf15afa3 100755 --- a/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_10_RouterAttachLinkQuality.py @@ -39,7 +39,7 @@ ROUTER3 = 4 class Cert_5_1_10_RouterAttachLinkQuality(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 7a3cd4ccb..af8f185eb 100755 --- a/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_1_11_REEDAttachLinkQuality.py @@ -39,7 +39,7 @@ ROUTER1 = 4 class Cert_5_1_11_REEDAttachLinkQuality(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 adea84c11..40d16b005 100755 --- a/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py +++ b/tests/scripts/thread-cert/Cert_5_1_12_NewRouterNeighborSync.py @@ -38,7 +38,7 @@ ROUTER2 = 3 class Cert_5_1_12_NewRouterSync(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 90331f2ff..e3d086272 100755 --- a/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py +++ b/tests/scripts/thread-cert/Cert_5_1_13_RouterReset.py @@ -37,7 +37,7 @@ ROUTER = 2 class Cert_5_1_13_RouterReset(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 fc27c34f6..d7fadc6a1 100755 --- a/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py +++ b/tests/scripts/thread-cert/Cert_5_2_01_REEDAttach.py @@ -41,7 +41,7 @@ MED1 = 4 class Cert_5_2_01_REEDAttach(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 548ca4d80..0b8ebc699 100755 --- a/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py +++ b/tests/scripts/thread-cert/Cert_5_2_03_LeaderReject2Hops.py @@ -40,7 +40,7 @@ ROUTER_32 = 33 class Cert_5_2_3_LeaderReject2Hops(thread_cert.TestCase): - topology = { + TOPOLOGY = { DUT_LEADER: { 'mode': 'rsdn', 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 fb8e9f6d5..829cb5625 100755 --- a/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_04_REEDUpgrade.py @@ -45,7 +45,7 @@ ROUTER_SELECTION_JITTER = 1 class Cert_5_2_4_REEDUpgrade(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 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 5fb04a627..5b7b5ecff 100755 --- a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py @@ -42,7 +42,7 @@ ROUTER_SELECTION_JITTER = 1 class Cert_5_2_5_AddressQuery(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 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 6d8d9af66..7929d3013 100755 --- a/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py +++ b/tests/scripts/thread-cert/Cert_5_2_06_RouterDowngrade.py @@ -41,7 +41,7 @@ ROUTER24 = 24 class Cert_5_2_06_RouterDowngrade(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 ef467e6a7..474398e58 100755 --- a/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_5_2_07_REEDSynchronization.py @@ -43,7 +43,7 @@ MLE_MIN_LINKS = 3 class Cert_5_2_7_REEDSynchronization(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 0ab4d0b8f..c6dd9796d 100755 --- a/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_01_LinkLocal.py @@ -37,7 +37,7 @@ DUT_ROUTER1 = 2 class Cert_5_3_1_LinkLocal(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface 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 bd9527fef..ad44a135f 100755 --- a/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_5_3_02_RealmLocal.py @@ -39,7 +39,7 @@ SED1 = 4 class Cert_5_3_2_RealmLocal(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 4282e09cd..127700d47 100755 --- a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py @@ -42,7 +42,7 @@ MED1_TIMEOUT = 3 class Cert_5_3_3_AddressQuery(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 dc5c6d0e8..181f268d7 100755 --- a/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py +++ b/tests/scripts/thread-cert/Cert_5_3_04_AddressMapCache.py @@ -45,7 +45,7 @@ MTDS = [SED1, ED1, ED2, ED3, ED4] class Cert_5_3_4_AddressMapCache(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 4dba2647e..f7b85d778 100755 --- a/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_5_3_05_RoutingLinkQuality.py @@ -40,7 +40,7 @@ ROUTER3 = 4 class Cert_5_3_5_RoutingLinkQuality(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 19cb7d485..f866f8047 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06_RouterIdMask.py @@ -40,7 +40,7 @@ ROUTER2 = 3 class Cert_5_3_6_RouterIdMask(thread_cert.TestCase): - topology = { + TOPOLOGY = { DUT_LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py index 856e688c8..4f86b417f 100755 --- a/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py +++ b/tests/scripts/thread-cert/Cert_5_3_06b_RouterIdMask.py @@ -37,7 +37,7 @@ ROUTER2 = 3 class Cert_5_3_6_RouterIdMask(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 9038073a7..81ced379c 100755 --- a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py +++ b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py @@ -45,7 +45,7 @@ MTDS = [MED1, SED1, MED3] class Cert_5_3_7_DuplicateAddress(thread_cert.TestCase): - topology = { + TOPOLOGY = { DUT_LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 6e841a619..4a74deab1 100755 --- a/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py +++ b/tests/scripts/thread-cert/Cert_5_3_08_ChildAddressSet.py @@ -44,7 +44,7 @@ MTDS = [MED1, MED2] class Cert_5_3_8_ChildAddressSet(thread_cert.TestCase): - topology = { + TOPOLOGY = { DUT_LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 d9c4bc6a1..225bb5264 100755 --- a/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_09_AddressQuery.py @@ -43,7 +43,7 @@ SED1 = 5 class Cert_5_3_09_AddressQuery(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 9ce42d467..c3b05cf89 100755 --- a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py @@ -43,9 +43,9 @@ MED1 = 5 class Cert_5_3_10_AddressQuery(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 768b123ef..7d3598751 100755 --- a/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py +++ b/tests/scripts/thread-cert/Cert_5_3_11_AddressQueryTimeoutIntervals.py @@ -39,7 +39,7 @@ MED1 = 3 class Cert_5_3_11_AddressQueryTimeoutIntervals(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 1678bdd63..cc0277216 100755 --- a/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_01_LeaderReboot.py @@ -40,7 +40,7 @@ DUT_ROUTER1 = 2 class Cert_5_5_1_LeaderReboot(thread_cert.TestCase): - topology = { + TOPOLOGY = { DUT_LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 f43b0a8bd..31b73fdf9 100755 --- a/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py +++ b/tests/scripts/thread-cert/Cert_5_5_02_LeaderReboot.py @@ -37,7 +37,7 @@ ED = 3 class Cert_5_5_2_LeaderReboot(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 d9f9a0316..3ebc304dc 100755 --- a/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py +++ b/tests/scripts/thread-cert/Cert_5_5_03_SplitMergeChildren.py @@ -42,7 +42,7 @@ MTDS = [ED1, ED2, ED3] class Cert_5_5_3_SplitMergeChildren(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 b121635fd..5fd091969 100755 --- a/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py +++ b/tests/scripts/thread-cert/Cert_5_5_04_SplitMergeRouters.py @@ -39,7 +39,7 @@ ROUTER4 = 5 class Cert_5_5_4_SplitMergeRouters(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 13052b58b..925ea997a 100755 --- a/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py +++ b/tests/scripts/thread-cert/Cert_5_5_05_SplitMergeREED.py @@ -40,7 +40,7 @@ REED1 = 17 class Cert_5_5_5_SplitMergeREED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 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 24869942b..a82688756 100755 --- a/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py +++ b/tests/scripts/thread-cert/Cert_5_5_07_SplitMergeThreeWay.py @@ -38,7 +38,7 @@ ROUTER3 = 4 class Cert_5_5_7_SplitMergeThreeWay(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER1: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_5_5_08_SplitRoutersLostLeader.py b/tests/scripts/thread-cert/Cert_5_5_08_SplitRoutersLostLeader.py index d2dc3395b..a25aef2e1 100755 --- a/tests/scripts/thread-cert/Cert_5_5_08_SplitRoutersLostLeader.py +++ b/tests/scripts/thread-cert/Cert_5_5_08_SplitRoutersLostLeader.py @@ -39,7 +39,7 @@ ED1 = 5 class Cert_5_5_8_SplitRoutersLostLeader(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER1: { 'mode': 'rsdn', 'panid': 0xface, 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 85afb1318..7319fc9bd 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_1_NetworkDataLeaderAsBr(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 fa91cd155..1663533ac 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_2_NetworkDataRouterAsBr(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 e66259d4e..5dab72fb4 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 80edcfbe2..bbef541bb 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 4ce313429..47675695a 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 93992a978..c92a90dd0 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -41,7 +41,7 @@ MTDS = [ED1, SED1] class Cert_5_6_6_NetworkDataExpiration(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 6331e3409..80b310f19 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -37,7 +37,7 @@ REED = 3 class Cert_5_6_7_NetworkDataRequestREED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py index b2184b5d6..827a20129 100755 --- a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py +++ b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py @@ -37,7 +37,7 @@ ED = 3 class Cert_5_6_8_ContextManagement(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'context_reuse_delay': 10, 'mode': 'rsdn', 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 39d92a000..8e4668e64 100755 --- a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py +++ b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py @@ -42,7 +42,7 @@ MTDS = [ED, SED] class Cert_5_6_9_NetworkDataForwarding(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py index c243420d3..9cafce202 100755 --- a/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py +++ b/tests/scripts/thread-cert/Cert_5_7_01_CoapDiagCommands_A.py @@ -48,9 +48,9 @@ MTDS = [MED1, SED1] class Cert_5_7_01_CoapDiagCommands_A(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'whitelist': [ROUTER1], }, diff --git a/tests/scripts/thread-cert/Cert_5_8_01_KeySynchronization.py b/tests/scripts/thread-cert/Cert_5_8_01_KeySynchronization.py index dbebc0903..2068990c7 100755 --- a/tests/scripts/thread-cert/Cert_5_8_01_KeySynchronization.py +++ b/tests/scripts/thread-cert/Cert_5_8_01_KeySynchronization.py @@ -36,7 +36,7 @@ ED = 2 class Cert_5_8_1_KeySynchronization(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'key_switch_guardtime': 0, 'mode': 'rsdn', 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 37c9d2c1f..c413fe3c0 100755 --- a/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py @@ -36,7 +36,7 @@ ROUTER = 2 class Cert_5_8_2_KeyIncrement(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'key_switch_guardtime': 0, 'mode': 'rsdn', 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 f350718ad..27bbe658d 100755 --- a/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py @@ -36,7 +36,7 @@ ROUTER = 2 class Cert_5_8_3_KeyIncrementRollOver(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'key_sequence_counter': 127, 'key_switch_guardtime': 0, 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 2a1a2088c..333bbba95 100755 --- a/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py +++ b/tests/scripts/thread-cert/Cert_6_1_01_RouterAttach.py @@ -37,7 +37,7 @@ ED = 2 class Cert_6_1_1_RouterAttach(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py index 260ba80b7..b4cf8f0bb 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_MED.py @@ -43,7 +43,7 @@ MED = 3 class Cert_6_1_2_REEDAttach_MED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py index 95c982ab7..bd9ec457b 100755 --- a/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_02_REEDAttach_SED.py @@ -44,7 +44,7 @@ SED = 3 class Cert_6_1_2_REEDAttach_SED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 d60737293..678b3f94c 100755 --- a/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_03_RouterAttachConnectivity.py @@ -40,7 +40,7 @@ ED = 5 class Cert_6_1_3_RouterAttachConnectivity(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 6d75ffd1d..e1d729495 100755 --- a/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py +++ b/tests/scripts/thread-cert/Cert_6_1_04_REEDAttachConnectivity.py @@ -39,7 +39,7 @@ ED = 5 class Cert_6_1_4_REEDAttachConnectivity(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_05_RouterAttachLinkQuality.py b/tests/scripts/thread-cert/Cert_6_1_05_RouterAttachLinkQuality.py index 254ebb9ab..778a39b91 100755 --- a/tests/scripts/thread-cert/Cert_6_1_05_RouterAttachLinkQuality.py +++ b/tests/scripts/thread-cert/Cert_6_1_05_RouterAttachLinkQuality.py @@ -38,7 +38,7 @@ ED = 4 class Cert_6_1_5_RouterAttachLinkQuality(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py index 64950bc61..6d96b5480 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_ED.py @@ -39,7 +39,7 @@ ED = 4 class Cert_6_1_6_REEDAttachLinkQuality_ED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py index 217775773..279e266a6 100755 --- a/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py +++ b/tests/scripts/thread-cert/Cert_6_1_06_REEDAttachLinkQuality_SED.py @@ -40,7 +40,7 @@ SED = 4 class Cert_6_1_6_REEDAttachLinkQuality_SED(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_1_07_EDSynchronization.py b/tests/scripts/thread-cert/Cert_6_1_07_EDSynchronization.py index 0fbe8d04c..e99ced24b 100755 --- a/tests/scripts/thread-cert/Cert_6_1_07_EDSynchronization.py +++ b/tests/scripts/thread-cert/Cert_6_1_07_EDSynchronization.py @@ -39,7 +39,7 @@ ROUTER3 = 5 class Cert_6_1_7_EDSynchronization(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 d4653b178..86ba12f86 100755 --- a/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_01_NewPartition.py @@ -37,7 +37,7 @@ ED = 3 class Cert_6_2_1_NewPartition(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 65ecbfec9..6c1a729a2 100755 --- a/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py +++ b/tests/scripts/thread-cert/Cert_6_2_02_NewPartition.py @@ -38,7 +38,7 @@ ED = 4 class Cert_6_2_2_NewPartition(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 e38fb30c7..aefd60621 100755 --- a/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py +++ b/tests/scripts/thread-cert/Cert_6_3_01_OrphanReattach.py @@ -37,7 +37,7 @@ ED = 3 class Cert_6_3_1_OrphanReattach(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 23471b0ec..852c2e505 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -36,7 +36,7 @@ ED = 2 class Cert_6_3_2_NetworkDataUpdate(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 d2cca1744..b2f7c55e0 100755 --- a/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_01_LinkLocal.py @@ -36,7 +36,7 @@ ED = 2 class Cert_6_4_1_LinkLocal(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 722dc79f3..897c772b6 100755 --- a/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py +++ b/tests/scripts/thread-cert/Cert_6_4_02_RealmLocal.py @@ -37,7 +37,7 @@ ED = 3 class Cert_5_3_2_RealmLocal(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetSynchronize.py b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetSynchronize.py index e3a49b18d..967c3eba7 100755 --- a/tests/scripts/thread-cert/Cert_6_5_01_ChildResetSynchronize.py +++ b/tests/scripts/thread-cert/Cert_6_5_01_ChildResetSynchronize.py @@ -37,7 +37,7 @@ ED = 2 class Cert_6_5_1_ChildResetSynchronize(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 58e1c6528..a66c7189d 100755 --- a/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py +++ b/tests/scripts/thread-cert/Cert_6_5_02_ChildResetReattach.py @@ -36,7 +36,7 @@ ED = 2 class Cert_6_5_2_ChildResetReattach(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 a75ef6b30..df2723944 100755 --- a/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py +++ b/tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py @@ -36,7 +36,7 @@ ED = 2 class Cert_6_6_1_KeyIncrement(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'key_switch_guardtime': 0, 'mode': 'rsdn', 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 2fe72d524..6a5675570 100755 --- a/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py +++ b/tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py @@ -36,7 +36,7 @@ ED = 2 class Cert_6_6_2_KeyIncrement1(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'key_sequence_counter': 127, 'key_switch_guardtime': 0, 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 5d893c72a..7bce1761d 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -51,7 +51,7 @@ MTDS = [SED1, MED1] class Cert_7_1_1_BorderRouterAsLeader(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 b18d38164..26ba669f3 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -41,7 +41,7 @@ MTDS = [ED2, SED2] class Cert_7_1_2_BorderRouterAsRouter(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 bf3a2c68d..7bc03fe3a 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -51,7 +51,7 @@ MTDS = [SED1, MED1] class Cert_7_1_3_BorderRouterAsLeader(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 cd7ba8bd0..10e4a7d22 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -41,7 +41,7 @@ MTDS = [SED2, ED2] class Cert_7_1_4_BorderRouterAsRouter(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 f3433dff2..bc12f7287 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -41,7 +41,7 @@ MTDS = [ED2, SED2] class Cert_7_1_5_BorderRouterAsRouter(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, 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 ae9c490f4..0a5e21461 100755 --- a/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_01_Commissioning.py @@ -41,9 +41,9 @@ JOINER = 2 class Cert_8_1_01_Commissioning(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'masterkey': '00112233445566778899aabbccddeeff', 'mode': 'rsdn', 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 706d6a314..0d39c4881 100755 --- a/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py +++ b/tests/scripts/thread-cert/Cert_8_1_02_Commissioning.py @@ -36,9 +36,9 @@ JOINER = 2 class Cert_8_1_02_Commissioning(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rsdn', 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 830252b41..925731d1f 100755 --- a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py @@ -37,9 +37,9 @@ JOINER = 3 class Cert_8_2_01_JoinerRouter(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rsdn', 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 650ed18f2..7efff7994 100755 --- a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py @@ -37,9 +37,9 @@ JOINER = 3 class Cert_8_2_02_JoinerRouter(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'masterkey': 'deadbeefdeadbeefdeadbeefdeadbeef', 'mode': 'rsdn', 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 5f1335a68..9749343e3 100755 --- a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py +++ b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py @@ -40,9 +40,9 @@ LEADER = 2 class Cert_9_2_02_MGMTCommissionerSet(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'mode': 'rsdn', 'panid': 0xface, 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 c1d1f9b7b..d831c6dcb 100755 --- a/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py +++ b/tests/scripts/thread-cert/Cert_9_2_04_ActiveDataset.py @@ -36,9 +36,9 @@ LEADER = 2 class Cert_9_2_04_ActiveDataset(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 10, 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 01f32a066..8249e9d9e 100755 --- a/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py +++ b/tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py @@ -47,9 +47,9 @@ COMMISSIONER_PENDING_PANID = 0xafce class Cert_9_2_7_DelayTimer(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': LEADER_ACTIVE_TIMESTAMP 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 e394ca0fc..a4730fcb3 100755 --- a/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py +++ b/tests/scripts/thread-cert/Cert_9_2_08_PersistentDatasets.py @@ -49,9 +49,9 @@ MTDS = [ED, SED] class Cert_9_2_8_PersistentDatasets(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': LEADER_ACTIVE_TIMESTAMP, 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 4f194b028..b8706e167 100755 --- a/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py @@ -44,9 +44,9 @@ ROUTER2 = 4 class Cert_9_2_09_PendingPartition(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 10, 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 0dafa5434..0ebeebe5e 100755 --- a/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_10_PendingPartition.py @@ -48,9 +48,9 @@ MTDS = [ED1, SED1] class Cert_9_2_10_PendingPartition(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 15, 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 7d140f619..13cef0360 100755 --- a/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py +++ b/tests/scripts/thread-cert/Cert_9_2_11_MasterKey.py @@ -48,9 +48,9 @@ MTDS = [ED1, SED1] class Cert_9_2_11_MasterKey(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 10, 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 6680e72ec..be2e522d7 100755 --- a/tests/scripts/thread-cert/Cert_9_2_12_Announce.py +++ b/tests/scripts/thread-cert/Cert_9_2_12_Announce.py @@ -47,9 +47,9 @@ DATASET2_PANID = 0xafce class Cert_9_2_12_Announce(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER1: { 'active_dataset': { 'timestamp': DATASET1_TIMESTAMP, 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 7d7153c9b..8c770cb7b 100755 --- a/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py +++ b/tests/scripts/thread-cert/Cert_9_2_13_EnergyScan.py @@ -38,9 +38,9 @@ ED1 = 4 class Cert_9_2_13_EnergyScan(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'mode': 'rsdn', 'panid': 0xface, 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 ec2e2981a..906a60665 100755 --- a/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py +++ b/tests/scripts/thread-cert/Cert_9_2_14_PanIdQuery.py @@ -38,9 +38,9 @@ LEADER2 = 4 class Cert_9_2_14_PanIdQuery(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'mode': 'rsdn', 'panid': 0xface, 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 d72661b3e..7be987590 100755 --- a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py @@ -43,9 +43,9 @@ ROUTER2 = 4 class Cert_9_2_15_PendingPartition(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 15, 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 72e645998..ee3df3975 100755 --- a/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py +++ b/tests/scripts/thread-cert/Cert_9_2_16_ActivePendingPartition.py @@ -44,9 +44,9 @@ ROUTER2 = 4 class Cert_9_2_16_ActivePendingPartition(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 1, 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 1ccec7add..ac1bd1834 100755 --- a/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py +++ b/tests/scripts/thread-cert/Cert_9_2_17_Orphan.py @@ -43,9 +43,9 @@ ED1 = 3 class Cert_9_2_17_Orphan(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER1: { 'active_dataset': { 'timestamp': 10, 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 f4a469b74..8e97452ca 100755 --- a/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py +++ b/tests/scripts/thread-cert/Cert_9_2_18_RollBackActiveTimestamp.py @@ -49,9 +49,9 @@ MTDS = [ED1, SED1] class Cert_9_2_18_RollBackActiveTimestamp(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { COMMISSIONER: { 'active_dataset': { 'timestamp': 1, diff --git a/tests/scripts/thread-cert/Test_Cli.py b/tests/scripts/thread-cert/Test_Cli.py index 423a5a878..9fb45c5cf 100755 --- a/tests/scripts/thread-cert/Test_Cli.py +++ b/tests/scripts/thread-cert/Test_Cli.py @@ -35,7 +35,7 @@ LEADER = 1 class Cert_Cli(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: {}, } diff --git a/tests/scripts/thread-cert/Test_MacScan.py b/tests/scripts/thread-cert/Test_MacScan.py index 64984fa03..8595d32bb 100755 --- a/tests/scripts/thread-cert/Test_MacScan.py +++ b/tests/scripts/thread-cert/Test_MacScan.py @@ -37,7 +37,7 @@ ROUTER = 2 class Test_MacScan(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'channel': 12, 'mode': 'rsdn', diff --git a/tests/scripts/thread-cert/test_coap_observe.py b/tests/scripts/thread-cert/test_coap_observe.py index f93c4f825..ae1161ba2 100755 --- a/tests/scripts/thread-cert/test_coap_observe.py +++ b/tests/scripts/thread-cert/test_coap_observe.py @@ -42,9 +42,9 @@ class TestCoapObserve(thread_cert.TestCase): Test suite for CoAP Observations (RFC7641). """ - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/test_coaps.py b/tests/scripts/thread-cert/test_coaps.py index 8dbe85d9e..98d74d920 100755 --- a/tests/scripts/thread-cert/test_coaps.py +++ b/tests/scripts/thread-cert/test_coaps.py @@ -37,9 +37,9 @@ ROUTER = 2 class TestCoaps(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/test_diag.py b/tests/scripts/thread-cert/test_diag.py index 053f23752..a1f89d789 100755 --- a/tests/scripts/thread-cert/test_diag.py +++ b/tests/scripts/thread-cert/test_diag.py @@ -34,9 +34,9 @@ import thread_cert class TestDiag(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = {1: None} + TOPOLOGY = {1: None} def test(self): node = self.nodes[1] diff --git a/tests/scripts/thread-cert/test_ipv6_fragmentation.py b/tests/scripts/thread-cert/test_ipv6_fragmentation.py index f9e830397..65c134978 100755 --- a/tests/scripts/thread-cert/test_ipv6_fragmentation.py +++ b/tests/scripts/thread-cert/test_ipv6_fragmentation.py @@ -38,9 +38,9 @@ ROUTER = 2 class TestIPv6Fragmentation(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xcafe, diff --git a/tests/scripts/thread-cert/test_ipv6_source_selection.py b/tests/scripts/thread-cert/test_ipv6_source_selection.py index 39c94c205..58df28c9d 100755 --- a/tests/scripts/thread-cert/test_ipv6_source_selection.py +++ b/tests/scripts/thread-cert/test_ipv6_source_selection.py @@ -37,9 +37,9 @@ ROUTER = 2 class TestIPv6SourceSelection(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xcafe, 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 b5f776291..9c18a7869 100755 --- a/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py +++ b/tests/scripts/thread-cert/test_reed_address_solicit_rejected.py @@ -47,9 +47,9 @@ SRV_0_SERVER_DATA = 'bar' class TestREEDAddressSolicitRejected(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface diff --git a/tests/scripts/thread-cert/test_reset.py b/tests/scripts/thread-cert/test_reset.py index e32208b85..a87ddeecd 100755 --- a/tests/scripts/thread-cert/test_reset.py +++ b/tests/scripts/thread-cert/test_reset.py @@ -37,7 +37,7 @@ SED = 4 class TestReset(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/test_route_table.py b/tests/scripts/thread-cert/test_route_table.py index 16d5587cb..42bf9eedd 100755 --- a/tests/scripts/thread-cert/test_route_table.py +++ b/tests/scripts/thread-cert/test_route_table.py @@ -41,7 +41,7 @@ ROUTER2 = 3 class TestRouteTable(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'mode': 'rsdn', 'panid': 0xface, diff --git a/tests/scripts/thread-cert/test_service.py b/tests/scripts/thread-cert/test_service.py index d5d39e18f..e7f91ecac 100755 --- a/tests/scripts/thread-cert/test_service.py +++ b/tests/scripts/thread-cert/test_service.py @@ -49,9 +49,9 @@ SRV_1_SERVER_DATA = 'qux' class Test_Service(thread_cert.TestCase): - support_ncp = False + SUPPORT_NCP = False - topology = { + TOPOLOGY = { LEADER: { 'channel': 12, 'mode': 'rsdn', diff --git a/tests/scripts/thread-cert/thread_cert.py b/tests/scripts/thread-cert/thread_cert.py index f467998ea..8ebe8f5fa 100644 --- a/tests/scripts/thread-cert/thread_cert.py +++ b/tests/scripts/thread-cert/thread_cert.py @@ -55,10 +55,10 @@ class NcpSupportMixin(): """ The mixin to check whether a test case supports NCP. """ - support_ncp = True + SUPPORT_NCP = True def __init__(self, *args, **kwargs): - if os.getenv('NODE_TYPE', 'sim') == 'ncp-sim' and not self.support_ncp: + if os.getenv('NODE_TYPE', 'sim') == 'ncp-sim' and not self.SUPPORT_NCP: # 77 means skip this test case in automake tests sys.exit(77) @@ -71,6 +71,8 @@ class TestCase(NcpSupportMixin, unittest.TestCase): The `topology` member of sub-class is used to create test topology. """ + TOPOLOGY = None + def setUp(self): """Create simulator, nodes and apply configurations. """ @@ -80,7 +82,7 @@ class TestCase(NcpSupportMixin, unittest.TestCase): self.nodes = {} initial_topology = {} - for i, params in self.topology.items(): + for i, params in self.TOPOLOGY.items(): if params: params = dict(DEFAULT_PARAMS, **params) else: diff --git a/tests/scripts/thread-cert/v1_2_router_5_1_1.py b/tests/scripts/thread-cert/v1_2_router_5_1_1.py index 224296de8..c7908adaf 100755 --- a/tests/scripts/thread-cert/v1_2_router_5_1_1.py +++ b/tests/scripts/thread-cert/v1_2_router_5_1_1.py @@ -38,7 +38,7 @@ ROUTER_1 = 2 class Router_5_1_01(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'version': '1.2' }, diff --git a/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py b/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py index 8d2b9940e..b50121f80 100755 --- a/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py +++ b/tests/scripts/thread-cert/v1_2_test_backbone_router_service.py @@ -70,7 +70,7 @@ BBR_REGISTRATION_JITTER = 5 class TestBackboneRouterService(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER_1_1: { 'version': '1.1', 'whitelist': [BBR_1, BBR_2], diff --git a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py index 8ddbe6883..85eba96eb 100755 --- a/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py +++ b/tests/scripts/thread-cert/v1_2_test_domain_unicast_address.py @@ -100,7 +100,7 @@ TEST_PREFIX3 = '2001:0:0:3::/64' class TestDomainUnicastAddress(thread_cert.TestCase): - topology = { + TOPOLOGY = { BBR_1: { 'version': '1.2', 'whitelist': [ROUTER_1_1, ROUTER_1_2], diff --git a/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py b/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py index d396a3836..a1a9dfebe 100755 --- a/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py +++ b/tests/scripts/thread-cert/v1_2_test_enhanced_frame_pending.py @@ -59,7 +59,7 @@ DEFAULT_POLL_PERIOD = CHILD_TIMEOUT - 4 class SED_EnhancedFramePending(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'version': '1.2' }, diff --git a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py index 21d2f5af1..d22ceb2ee 100755 --- a/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py +++ b/tests/scripts/thread-cert/v1_2_test_enhanced_keep_alive.py @@ -45,7 +45,7 @@ USER_POLL_PERIOD = CHILD_TIMEOUT // 3 class SED_EnhancedKeepAlive(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER: { 'version': '1.2' }, diff --git a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py index cd0ba74dc..e0c1305ad 100755 --- a/tests/scripts/thread-cert/v1_2_test_multicast_registration.py +++ b/tests/scripts/thread-cert/v1_2_test_multicast_registration.py @@ -95,7 +95,7 @@ MED_1_2 --- LEADER_1_2 --- MED_1_1 class TestMulticastRegistration(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER_1_2: { 'version': '1.2', 'whitelist': [MED_1_2, SED_1_2, MED_1_1, SED_1_1, ROUTER_1_1], diff --git a/tests/scripts/thread-cert/v1_2_test_parent_selection.py b/tests/scripts/thread-cert/v1_2_test_parent_selection.py index 3d7aae433..2df27faf0 100755 --- a/tests/scripts/thread-cert/v1_2_test_parent_selection.py +++ b/tests/scripts/thread-cert/v1_2_test_parent_selection.py @@ -69,7 +69,7 @@ MED_1_2 = 7 class TestParentSelection(thread_cert.TestCase): - topology = { + TOPOLOGY = { LEADER_1_2: { 'version': '1.2', 'whitelist': [REED_1_2, ROUTER_1_2, REED_1_1, ROUTER_1_1, MED_1_1],