mirror of
https://github.com/espressif/openthread.git
synced 2026-09-06 01:00:09 +00:00
[network-data] add Service/Server TLV support (#2256)
This commit is contained in:
Kamil Burzynski
committed by
Jonathan Hui
Jonathan Hui
parent
1436d9b067
commit
005781d066
@@ -143,6 +143,7 @@ EXTRA_DIST = \
|
||||
test_lowpan.py \
|
||||
test_mac802154.py \
|
||||
test_mle.py \
|
||||
test_service.py \
|
||||
test_network_data.py \
|
||||
test_network_layer.py \
|
||||
$(NULL)
|
||||
@@ -158,6 +159,7 @@ check_SCRIPTS = \
|
||||
test_lowpan.py \
|
||||
test_mac802154.py \
|
||||
test_mle.py \
|
||||
test_service.py \
|
||||
test_network_data.py \
|
||||
test_network_layer.py \
|
||||
Cert_5_2_02_LeaderReject1Hop.py \
|
||||
@@ -263,6 +265,7 @@ TESTS = \
|
||||
$(NULL)
|
||||
|
||||
XFAIL_NCP_TESTS = \
|
||||
test_service.py \
|
||||
Cert_5_2_05_AddressQuery.py \
|
||||
Cert_5_3_09_AddressQuery.py \
|
||||
Cert_8_1_01_Commissioning.py \
|
||||
|
||||
@@ -188,6 +188,12 @@ class Node:
|
||||
def get_addrs(self):
|
||||
return self.interface.get_addrs()
|
||||
|
||||
def add_service(self, enterpriseNumber, serviceData, serverData):
|
||||
self.interface.add_service(enterpriseNumber, serviceData, serverData)
|
||||
|
||||
def remove_service(self, enterpriseNumber, serviceData):
|
||||
self.interface.remove_service(enterpriseNumber, serviceData)
|
||||
|
||||
def get_ip6_address(self, address_type):
|
||||
return self.interface.get_ip6_address(address_type)
|
||||
|
||||
|
||||
@@ -197,6 +197,12 @@ class otApi:
|
||||
def get_addrs(self):
|
||||
return self.Api.otNodeGetAddrs(self.otNode).decode("utf-8").split("\n")
|
||||
|
||||
def add_service(self, enterpriseNumber, serviceData, serverData):
|
||||
raise OSError("otServerAddService wrapper not implemented!")
|
||||
|
||||
def remove_service(self, enterpriseNumber, serviceData):
|
||||
raise OSError("otServerRemoveService wrapper not implemented!")
|
||||
|
||||
def get_context_reuse_delay(self):
|
||||
return int(self.Api.otNodeGetContextReuseDelay(self.otNode))
|
||||
|
||||
|
||||
@@ -375,6 +375,16 @@ class otCli:
|
||||
|
||||
return addrs
|
||||
|
||||
def add_service(self, enterpriseNumber, serviceData, serverData):
|
||||
cmd = 'service add ' + enterpriseNumber + ' ' + serviceData+ ' ' + serverData
|
||||
self.send_command(cmd)
|
||||
self.pexpect.expect('Done')
|
||||
|
||||
def remove_service(self, enterpriseNumber, serviceData):
|
||||
cmd = 'service remove ' + enterpriseNumber + ' ' + serviceData
|
||||
self.send_command(cmd)
|
||||
self.pexpect.expect('Done')
|
||||
|
||||
def __getLinkLocalAddress(self):
|
||||
for ip6Addr in self.get_addrs():
|
||||
if re.match(config.LINK_LOCAL_REGEX_PATTERN, ip6Addr, re.I):
|
||||
|
||||
Executable
+208
@@ -0,0 +1,208 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (c) 2017, The OpenThread Authors.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
# 3. Neither the name of the copyright holder nor the
|
||||
# names of its contributors may be used to endorse or promote products
|
||||
# derived from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
import re
|
||||
import time
|
||||
import unittest
|
||||
|
||||
import node
|
||||
import config
|
||||
|
||||
LEADER = 1
|
||||
ROUTER1 = 2
|
||||
ROUTER2 = 3
|
||||
|
||||
SRV_0_ID = 0
|
||||
SRV_0_ENT_NUMBER = '123'
|
||||
SRV_0_SERVICE_DATA = 'foo'
|
||||
SRV_0_SERVER_DATA = 'bar'
|
||||
|
||||
SRV_1_ID = 1
|
||||
SRV_1_ENT_NUMBER = '234'
|
||||
SRV_1_SERVICE_DATA = 'baz'
|
||||
SRV_1_SERVER_DATA = 'qux'
|
||||
|
||||
class Test_Service(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.nodes = {}
|
||||
for i in range(1,4):
|
||||
self.nodes[i] = node.Node(i)
|
||||
|
||||
self.nodes[LEADER].set_panid(0xface)
|
||||
self.nodes[LEADER].set_mode('rsdn')
|
||||
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64())
|
||||
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER2].get_addr64())
|
||||
self.nodes[LEADER].enable_whitelist()
|
||||
self.nodes[LEADER].set_channel(12)
|
||||
self.nodes[LEADER].set_network_name('OpenThread')
|
||||
|
||||
self.nodes[ROUTER1].set_panid(0xface)
|
||||
self.nodes[ROUTER1].set_mode('rsdn')
|
||||
self.nodes[ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64())
|
||||
self.nodes[ROUTER1].add_whitelist(self.nodes[ROUTER2].get_addr64())
|
||||
self.nodes[ROUTER1].enable_whitelist()
|
||||
self.nodes[ROUTER1].set_channel(12)
|
||||
self.nodes[ROUTER1].set_network_name('OpenThread')
|
||||
self.nodes[ROUTER1].set_router_selection_jitter(1)
|
||||
|
||||
self.nodes[ROUTER2].set_panid(0xface)
|
||||
self.nodes[ROUTER2].set_mode('rsdn')
|
||||
self.nodes[ROUTER2].add_whitelist(self.nodes[LEADER].get_addr64())
|
||||
self.nodes[ROUTER2].add_whitelist(self.nodes[ROUTER1].get_addr64())
|
||||
self.nodes[ROUTER2].enable_whitelist()
|
||||
self.nodes[ROUTER2].set_channel(12)
|
||||
self.nodes[ROUTER2].set_network_name('OpenThread')
|
||||
self.nodes[ROUTER2].set_router_selection_jitter(1)
|
||||
|
||||
def tearDown(self):
|
||||
for node in list(self.nodes.values()):
|
||||
node.stop()
|
||||
del self.nodes
|
||||
|
||||
def hasAloc(self, node_id, service_id):
|
||||
for addr in self.nodes[node_id].get_ip6_address(config.ADDRESS_TYPE.ALOC):
|
||||
m = re.match('.*:fc(..)$', addr, re.I)
|
||||
if m is not None:
|
||||
if m.group(1) == str(service_id + 10): # for service_id=3 look for '...:fc13'
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
def pingFromAll(self, addr):
|
||||
for node in list(self.nodes.values()):
|
||||
self.assertTrue(node.ping(addr))
|
||||
|
||||
def failToPingFromAll(self, addr):
|
||||
for node in list(self.nodes.values()):
|
||||
self.assertFalse(node.ping(addr, timeout=3000))
|
||||
|
||||
def test(self):
|
||||
self.nodes[LEADER].start()
|
||||
self.nodes[LEADER].set_state('leader')
|
||||
self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
|
||||
|
||||
self.nodes[ROUTER1].start()
|
||||
self.nodes[ROUTER2].start()
|
||||
time.sleep(5)
|
||||
self.assertEqual(self.nodes[ROUTER1].get_state(), 'router')
|
||||
self.assertEqual(self.nodes[ROUTER2].get_state(), 'router')
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
|
||||
|
||||
self.nodes[ROUTER1].add_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA)
|
||||
self.nodes[ROUTER1].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
|
||||
|
||||
aloc0 = self.nodes[ROUTER1].get_ip6_address(config.ADDRESS_TYPE.ALOC)[0]
|
||||
self.pingFromAll(aloc0)
|
||||
|
||||
self.nodes[LEADER].add_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA)
|
||||
self.nodes[LEADER].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
|
||||
|
||||
self.pingFromAll(aloc0)
|
||||
|
||||
self.nodes[ROUTER2].add_service(SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA, SRV_1_SERVER_DATA)
|
||||
self.nodes[ROUTER2].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), True)
|
||||
|
||||
aloc1 = self.nodes[ROUTER2].get_ip6_address(config.ADDRESS_TYPE.ALOC)[0]
|
||||
self.pingFromAll(aloc0)
|
||||
self.pingFromAll(aloc1)
|
||||
|
||||
self.nodes[ROUTER1].remove_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA)
|
||||
self.nodes[ROUTER1].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), True)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), True)
|
||||
|
||||
self.pingFromAll(aloc0)
|
||||
self.pingFromAll(aloc1)
|
||||
|
||||
self.nodes[LEADER].remove_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA)
|
||||
self.nodes[LEADER].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), True)
|
||||
|
||||
self.failToPingFromAll(aloc0)
|
||||
self.pingFromAll(aloc1)
|
||||
|
||||
self.nodes[ROUTER2].remove_service(SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA)
|
||||
self.nodes[ROUTER2].register_netdata()
|
||||
time.sleep(2)
|
||||
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(LEADER, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER1, SRV_1_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
|
||||
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
|
||||
|
||||
self.failToPingFromAll(aloc0)
|
||||
self.failToPingFromAll(aloc1)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user