diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index cb6dccaea..658d07a7a 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -504,7 +504,7 @@ exit: ThreadError MleRouter::SendLinkRequest(Neighbor *aNeighbor) { - static const uint8_t detachedTlvs[] = {Tlv::kNetworkData, Tlv::kAddress16, Tlv::kRoute}; + static const uint8_t detachedTlvs[] = {Tlv::kAddress16, Tlv::kRoute}; static const uint8_t routerTlvs[] = {Tlv::kLinkMargin}; ThreadError error = kThreadError_None; Message *message; @@ -727,11 +727,6 @@ ThreadError MleRouter::SendLinkAccept(const Ip6::MessageInfo &aMessageInfo, Neig SuccessOrExit(error = AppendAddress16(*message, aNeighbor->mValid.mRloc16)); break; - case Tlv::kNetworkData: - VerifyOrExit(aNeighbor != NULL, error = kThreadError_Drop); - SuccessOrExit(error = AppendNetworkData(*message, (aNeighbor->mMode & ModeTlv::kModeFullNetworkData) == 0)); - break; - case Tlv::kLinkMargin: break; @@ -807,7 +802,6 @@ ThreadError MleRouter::HandleLinkAccept(const Message &aMessage, const Ip6::Mess Address16Tlv address16; RouteTlv route; LeaderDataTlv leaderData; - NetworkDataTlv networkData; LinkMarginTlv linkMargin; ChallengeTlv challenge; TlvRequestTlv tlvRequest; @@ -901,19 +895,16 @@ ThreadError MleRouter::HandleLinkAccept(const Message &aMessage, const Ip6::Mess VerifyOrExit(leaderData.IsValid(), error = kThreadError_Parse); SetLeaderData(leaderData.GetPartitionId(), leaderData.GetWeighting(), leaderData.GetLeaderRouterId()); - // Network Data - SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kNetworkData, sizeof(networkData), networkData)); - mNetworkData.SetNetworkData(leaderData.GetDataVersion(), leaderData.GetStableDataVersion(), - (mDeviceMode & ModeTlv::kModeFullNetworkData) == 0, - networkData.GetNetworkData(), networkData.GetLength()); - if (mLeaderData.GetLeaderRouterId() == GetRouterId(GetRloc16())) { SetStateLeader(GetRloc16()); } else { + static const uint8_t tlvs[] = {Tlv::kNetworkData}; SetStateRouter(GetRloc16()); + mRetrieveNewNetworkData = true; + SendDataRequest(aMessageInfo.GetPeerAddr(), tlvs, sizeof(tlvs)); } break; diff --git a/tests/scripts/Makefile.am b/tests/scripts/Makefile.am index 18fba85e7..0f268dbc4 100644 --- a/tests/scripts/Makefile.am +++ b/tests/scripts/Makefile.am @@ -111,6 +111,7 @@ EXTRA_DIST = \ thread-cert/Cert_9_2_12_Announce.py \ thread-cert/Cert_9_2_13_EnergyScan.py \ thread-cert/Cert_9_2_14_PanIdQuery.py \ + thread-cert/Cert_9_2_15_PendingPartition.py \ thread-cert/node.py \ $(NULL) @@ -234,6 +235,7 @@ check_SCRIPTS += \ thread-cert/Cert_9_2_12_Announce.py \ thread-cert/Cert_9_2_13_EnergyScan.py \ thread-cert/Cert_9_2_14_PanIdQuery.py \ + thread-cert/Cert_9_2_15_PendingPartition.py \ $(NULL) endif # OPENTHREAD_TESTS_SUBSET5 @@ -259,6 +261,7 @@ XFAIL_NCP_TESTS = \ thread-cert/Cert_9_2_12_Announce.py \ thread-cert/Cert_9_2_13_EnergyScan.py \ thread-cert/Cert_9_2_14_PanIdQuery.py \ + thread-cert/Cert_9_2_15_PendingPartition.py \ $(NULL) XFAIL_TESTS = $(if $(filter $(NODE_TYPE),ncp-sim),$(XFAIL_NCP_TESTS)) diff --git a/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py new file mode 100755 index 000000000..bd99c3c86 --- /dev/null +++ b/tests/scripts/thread-cert/Cert_9_2_15_PendingPartition.py @@ -0,0 +1,132 @@ +#!/usr/bin/python +# +# Copyright (c) 2016, 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 time +import unittest + +import node + +CHANNEL_INIT = 19 +PANID_INIT = 0xface + +PANID_FINAL = 0xabcd + +COMMISSIONER = 1 +LEADER = 2 +ROUTER1 = 3 +ROUTER2 = 4 + +class Cert_9_2_15_PendingPartition(unittest.TestCase): + def setUp(self): + self.nodes = {} + for i in range(1,5): + self.nodes[i] = node.Node(i) + + self.nodes[COMMISSIONER].set_active_dataset(15, channel=CHANNEL_INIT, panid=PANID_INIT) + self.nodes[COMMISSIONER].set_mode('rsdn') + self.nodes[COMMISSIONER].add_whitelist(self.nodes[LEADER].get_addr64()) + self.nodes[COMMISSIONER].enable_whitelist() + self.nodes[COMMISSIONER].set_router_selection_jitter(1) + + self.nodes[LEADER].set_active_dataset(15, channel=CHANNEL_INIT, panid=PANID_INIT) + self.nodes[LEADER].set_mode('rsdn') + self.nodes[LEADER].set_partition_id(0xffffffff) + self.nodes[LEADER].add_whitelist(self.nodes[COMMISSIONER].get_addr64()) + self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64()) + self.nodes[LEADER].enable_whitelist() + self.nodes[LEADER].set_router_selection_jitter(1) + + self.nodes[ROUTER1].set_active_dataset(15, channel=CHANNEL_INIT, panid=PANID_INIT) + 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_router_selection_jitter(1) + + self.nodes[ROUTER2].set_active_dataset(15, channel=CHANNEL_INIT, panid=PANID_INIT) + self.nodes[ROUTER2].set_mode('rsdn') + self.nodes[ROUTER2].add_whitelist(self.nodes[ROUTER1].get_addr64()) + self.nodes[ROUTER2].enable_whitelist() + self.nodes[ROUTER2].set_router_selection_jitter(1) + + def tearDown(self): + for node in list(self.nodes.values()): + node.stop() + del self.nodes + + def test(self): + self.nodes[LEADER].start() + self.nodes[LEADER].set_state('leader') + self.assertEqual(self.nodes[LEADER].get_state(), 'leader') + + self.nodes[COMMISSIONER].start() + time.sleep(5) + self.assertEqual(self.nodes[COMMISSIONER].get_state(), 'router') + + self.nodes[ROUTER1].start() + time.sleep(5) + self.assertEqual(self.nodes[ROUTER1].get_state(), 'router') + + self.nodes[COMMISSIONER].send_mgmt_pending_set(pending_timestamp=10, + active_timestamp=70, + delay_timer=600000, + mesh_local='fd00:0db9::') + time.sleep(5) + + self.nodes[ROUTER2].start() + time.sleep(5) + self.assertEqual(self.nodes[ROUTER2].get_state(), 'router') + + self.nodes[ROUTER2].stop() + + self.nodes[COMMISSIONER].send_mgmt_pending_set(pending_timestamp=20, + active_timestamp=80, + delay_timer=200000, + mesh_local='fd00:0db7::', + panid=PANID_FINAL) + time.sleep(100) + + self.nodes[ROUTER2].start() + time.sleep(5) + self.assertEqual(self.nodes[ROUTER2].get_state(), 'router') + time.sleep(100) + + self.assertEqual(self.nodes[COMMISSIONER].get_panid(), PANID_FINAL) + self.assertEqual(self.nodes[LEADER].get_panid(), PANID_FINAL) + self.assertEqual(self.nodes[ROUTER1].get_panid(), PANID_FINAL) + self.assertEqual(self.nodes[ROUTER2].get_panid(), PANID_FINAL) + + ipaddrs = self.nodes[ROUTER2].get_addrs() + for ipaddr in ipaddrs: + if ipaddr[0:4] != 'fe80': + break + self.assertTrue(self.nodes[LEADER].ping(ipaddr)) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/scripts/thread-cert/node.py b/tests/scripts/thread-cert/node.py index 0f5e7ae0b..e6c4d7f07 100755 --- a/tests/scripts/thread-cert/node.py +++ b/tests/scripts/thread-cert/node.py @@ -504,7 +504,7 @@ class Node: self.pexpect.expect('Done') def send_mgmt_pending_set(self, pending_timestamp=None, active_timestamp=None, delay_timer=None, channel=None, - panid=None, master_key=None): + panid=None, master_key=None, mesh_local=None): cmd = 'dataset mgmtsetcommand pending ' if pending_timestamp != None: @@ -525,6 +525,9 @@ class Node: if master_key != None: cmd += 'masterkey ' + master_key + ' ' + if mesh_local != None: + cmd += 'localprefix ' + mesh_local + ' ' + self.send_command(cmd) self.pexpect.expect('Done')