espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-22 02:19:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] properly configure operational dataset in BR tests (#9209)

Browse Source
This commit is contained in:
Jonathan Hui
2023-06-26 22:23:53 -07:00
committed by GitHub
parent 8e9bbbc88e
commit 3901e29e89
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py
+21 -5
View File
@@ -26,6 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
import binascii
import ipaddress import ipaddress
import logging import logging
import unittest import unittest
@@ -82,8 +83,8 @@ class PublishMeshCopService(thread_cert.TestCase):
br2.disable_br() br2.disable_br()
# Use different network names to distinguish meshcop services # Use different network names to distinguish meshcop services
br1.set_network_name('ot-br1') br1.set_active_dataset(updateExisting=True, network_name='ot-br1')
br2.set_network_name('ot-br2') br2.set_active_dataset(updateExisting=True, network_name='ot-br2')
host.start(start_radvd=False) host.start(start_radvd=False)
self.simulator.go(20) self.simulator.go(20)
@@ -101,13 +102,13 @@ class PublishMeshCopService(thread_cert.TestCase):
self.check_meshcop_service(br1, host) self.check_meshcop_service(br1, host)
br1.stop() br1.stop()
br1.set_network_name('ot-br1-1') br1.set_active_dataset(updateExisting=True, network_name='ot-br1-1')
br1.start() br1.start()
self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY)
self.check_meshcop_service(br1, host) self.check_meshcop_service(br1, host)
# verify that there are two meshcop services # verify that there are two meshcop services
br2.set_network_name('ot-br2-1') br2.set_active_dataset(updateExisting=True, network_name='ot-br2-1')
br2.start() br2.start()
br2.disable_backbone_router() br2.disable_backbone_router()
br2.enable_br() br2.enable_br()
@@ -131,7 +132,22 @@ class PublishMeshCopService(thread_cert.TestCase):
self.check_meshcop_service(br2, host) self.check_meshcop_service(br2, host)
br1.factory_reset() br1.factory_reset()
br1.set_network_name('ot-br-1-3')
dataset = {
'timestamp': 1,
'channel': config.CHANNEL,
'channel_mask': config.CHANNEL_MASK,
'extended_panid': config.EXTENDED_PANID,
'mesh_local_prefix': config.MESH_LOCAL_PREFIX.split('/')[0],
'network_key': binascii.hexlify(config.DEFAULT_NETWORK_KEY).decode(),
'network_name': 'ot-br-1-3',
'panid': config.PANID,
'pskc': config.PSKC,
'security_policy': config.SECURITY_POLICY,
}
br1.set_active_dataset(**dataset)
self.assertEqual(len(host.browse_mdns_services('_meshcop._udp')), 2) self.assertEqual(len(host.browse_mdns_services('_meshcop._udp')), 2)
self.check_meshcop_service(br1, host) self.check_meshcop_service(br1, host)
self.check_meshcop_service(br2, host) self.check_meshcop_service(br2, host)
tests/scripts/thread-cert/node.py
+6 -1
View File
@@ -2557,8 +2557,13 @@ class NodeImpl:
panid=None, panid=None,
pskc=None, pskc=None,
security_policy=[], security_policy=[],
updateExisting=False,
): ):
self.send_command('dataset clear', go=False)
if updateExisting:
self.send_command('dataset init active', go=False)
else:
self.send_command('dataset clear', go=False)
self._expect_done() self._expect_done()
if timestamp is not None: if timestamp is not None: