[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
This commit is contained in:
Simon Lin
2021-05-11 12:56:33 -07:00
committed by GitHub
parent f97d9c7de5
commit c1e2e168d6
156 changed files with 20 additions and 1002 deletions
@@ -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',
@@ -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,
}
}
@@ -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,
},
@@ -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,
},
}
@@ -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,
},
}
@@ -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',
@@ -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: {
@@ -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',
@@ -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',