espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-07 11:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[github-actions] migrate version 1.3 checks to 1.4 (#10694)

Browse Source
This commit is contained in:
Jonathan Hui
2024-09-11 07:25:32 -07:00
committed by GitHub
parent c0690e78fc
commit 2f51cababf
16 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/border_router/nat64/test_upstream_dns.py
+2 -2
View File
@@ -72,12 +72,12 @@ class UpstreamDns(thread_cert.TestCase):
'name': 'BR',
'allowlist': [ROUTER],
'is_otbr': True,
'version': '1.3',
'version': '1.4',
},
ROUTER: {
'name': 'Router',
'allowlist': [BR],
'version': '1.3',
'version': '1.4',
},
HOST: {
'name': 'Host',
tests/scripts/thread-cert/border_router/test_firewall.py
+3 -3
View File
@@ -63,17 +63,17 @@ class Firewall(thread_cert.TestCase):
'name': 'BR_1',
'allowlist': [ROUTER1, ROUTER2],
'is_otbr': True,
'version': '1.3',
'version': '1.4',
},
ROUTER1: {
'name': 'Router_1',
'allowlist': [BR1],
'version': '1.3',
'version': '1.4',
},
ROUTER2: {
'name': 'Router_2',
'allowlist': [BR1],
'version': '1.3',
'version': '1.4',
},
HOST: {
'name': 'Host',
tests/scripts/thread-cert/border_router/test_multi_ail.py
+3 -3
View File
@@ -58,21 +58,21 @@ class ThreeBRs_TwoInfra(thread_cert.TestCase):
'backbone_network_id': 0,
'allowlist': [BR2],
'is_otbr': True,
'version': '1.3',
'version': '1.4',
},
BR2: {
'name': 'BR_2',
'backbone_network_id': 1,
'allowlist': [BR1, BR3],
'is_otbr': True,
'version': '1.3',
'version': '1.4',
},
BR3: {
'name': 'BR_3',
'backbone_network_id': 1,
'allowlist': [BR2],
'is_otbr': True,
'version': '1.3',
'version': '1.4',
}
}
tests/scripts/thread-cert/config.py
+1
View File
@@ -160,6 +160,7 @@ LEADER_NOTIFY_SED_BY_CHILD_UPDATE_REQUEST = True
THREAD_VERSION_1_1 = 2
THREAD_VERSION_1_2 = 3
THREAD_VERSION_1_3 = 4
THREAD_VERSION_1_4 = 5
PACKET_VERIFICATION_NONE = 0
PACKET_VERIFICATION_DEFAULT = 1
tests/scripts/thread-cert/node.py
+6 -6
View File
@@ -625,8 +625,8 @@ class OtCli:
if self.version != '1.1' and self.is_bbr:
if 'OT_CLI_PATH_BBR' in os.environ:
cmd = os.environ['OT_CLI_PATH_BBR']
elif 'top_builddir_1_3_bbr' in os.environ:
srcdir = os.environ['top_builddir_1_3_bbr']
elif 'top_builddir_1_4_bbr' in os.environ:
srcdir = os.environ['top_builddir_1_4_bbr']
cmd = '%s/examples/apps/cli/ot-cli-%s' % (srcdir, mode)
# Load Thread device of the testing environment version (may be 1.1 or 1.2)
@@ -692,13 +692,13 @@ class OtCli:
# Load Thread 1.2 BBR device when testing Thread 1.2 scenarios
# which requires device with Backbone functionality.
if self.version != '1.1' and self.is_bbr:
if 'OT_NCP_PATH_1_3_BBR' in os.environ:
if 'OT_NCP_PATH_1_4_BBR' in os.environ:
cmd = 'spinel-cli.py -p "%s%s" -n' % (
os.environ['OT_NCP_PATH_1_3_BBR'],
os.environ['OT_NCP_PATH_1_4_BBR'],
args,
)
elif 'top_builddir_1_3_bbr' in os.environ:
srcdir = os.environ['top_builddir_1_3_bbr']
elif 'top_builddir_1_4_bbr' in os.environ:
srcdir = os.environ['top_builddir_1_4_bbr']
cmd = '%s/examples/apps/ncp/ot-ncp-%s' % (srcdir, mode)
cmd = 'spinel-cli.py -p "%s%s" -n' % (
cmd,
tests/scripts/thread-cert/pktverify/packet_verifier.py
+1 -1
View File
@@ -176,7 +176,7 @@ class PacketVerifier(object):
for i, topo in self.test_info.topology.items():
name = self.test_info.get_node_name(i)
if topo['version']:
self._vars[name + '_VERSION'] = {'1.1': 2, '1.2': 3, '1.3': 4}[topo['version']]
self._vars[name + '_VERSION'] = {'1.1': 2, '1.2': 3, '1.3': 4, '1.4': 5}[topo['version']]
def verify_attached(self, child: str, parent: str = None, child_type: str = 'FTD', pkts=None) -> VerifyResult:
"""
tests/scripts/thread-cert/thread_cert.py
+3 -3
View File
@@ -511,7 +511,7 @@ class TestCase(NcpSupportMixin, unittest.TestCase):
if params.get('is_bbr') or params.get('is_otbr'):
# BBRs must not use thread version 1.1
version = params.get('version', '1.3')
version = params.get('version', '1.4')
assert version != '1.1', params
params['version'] = version
params.setdefault('bbr_registration_jitter', config.DEFAULT_BBR_REGISTRATION_JITTER)
@@ -520,9 +520,9 @@ class TestCase(NcpSupportMixin, unittest.TestCase):
assert params.get('version', '') == '', params
params['version'] = ''
# use 1.3 node for 1.2 tests
# use 1.4 node for 1.2 tests
if params.get('version') == '1.2':
params['version'] = '1.3'
params['version'] = '1.4'
is_ftd = (not params.get('is_mtd') and not params.get('is_host'))