Add Thread Certification 9.2.9 to automated test. (#756)

src/core/thread/meshcop_dataset_manager.cpp

@@ -793,8 +793,10 @@ PendingDataset::PendingDataset(ThreadNetif &aThreadNetif):
 
 void PendingDataset::StartLeader(void)
 {
+    UpdateDelayTimer(mLocal, mLocalTime);
     mNetwork = mLocal;
-    mNetworkTime = mLocalTime;
+    ResetDelayTimer(kFlagNetworkUpdated);
+
     mCoapServer.AddResource(mResourceGet);
     mCoapServer.AddResource(mResourceSet);
 }

src/core/thread/mle.cpp

@@ -1851,8 +1851,12 @@ ThreadError Mle::HandleDataResponse(const Message &aMessage, const Ip6::MessageI
     // Active Dataset
     if (activeTimestamp.GetLength() > 0)
     {
-        aMessage.Read(activeDatasetOffset, sizeof(tlv), &tlv);
-        mNetif.GetActiveDataset().Set(activeTimestamp, aMessage, activeDatasetOffset + sizeof(tlv), tlv.GetLength());
+        if (activeDatasetOffset > 0)
+        {
+            aMessage.Read(activeDatasetOffset, sizeof(tlv), &tlv);
+            mNetif.GetActiveDataset().Set(activeTimestamp, aMessage, activeDatasetOffset + sizeof(tlv),
+                                          tlv.GetLength());
+        }
     }
     else
     {
@@ -1862,8 +1866,12 @@ ThreadError Mle::HandleDataResponse(const Message &aMessage, const Ip6::MessageI
     // Pending Dataset
     if (pendingTimestamp.GetLength() > 0)
     {
-        aMessage.Read(pendingDatasetOffset, sizeof(tlv), &tlv);
-        mNetif.GetPendingDataset().Set(pendingTimestamp, aMessage, pendingDatasetOffset + sizeof(tlv), tlv.GetLength());
+        if (pendingDatasetOffset > 0)
+        {
+            aMessage.Read(pendingDatasetOffset, sizeof(tlv), &tlv);
+            mNetif.GetPendingDataset().Set(pendingTimestamp, aMessage, pendingDatasetOffset + sizeof(tlv),
+                                           tlv.GetLength());
+        }
     }
     else
     {

src/core/thread/mle_router.cpp

@@ -2316,6 +2316,8 @@ ThreadError MleRouter::SendChildIdResponse(Child *aChild)
     SuccessOrExit(error = AppendHeader(*message, Header::kCommandChildIdResponse));
     SuccessOrExit(error = AppendSourceAddress(*message));
     SuccessOrExit(error = AppendLeaderData(*message));
+    SuccessOrExit(error = AppendActiveTimestamp(*message));
+    SuccessOrExit(error = AppendPendingTimestamp(*message));
 
     // pick next Child ID that is not being used
     do
@@ -3767,8 +3769,6 @@ ThreadError MleRouter::AppendActiveDataset(Message &aMessage)
     ThreadError error = kThreadError_None;
     Tlv tlv;
 
-    SuccessOrExit(error = AppendActiveTimestamp(aMessage));
-
     tlv.SetType(Tlv::kActiveDataset);
     tlv.SetLength(mNetif.GetActiveDataset().GetNetwork().GetSize());
     SuccessOrExit(error = aMessage.Append(&tlv, sizeof(tlv)));
@@ -3783,8 +3783,6 @@ ThreadError MleRouter::AppendPendingDataset(Message &aMessage)
     ThreadError error = kThreadError_None;
     Tlv tlv;
 
-    SuccessOrExit(error = AppendPendingTimestamp(aMessage));
-
     tlv.SetType(Tlv::kPendingDataset);
     tlv.SetLength(mNetif.GetPendingDataset().GetNetwork().GetSize());
     SuccessOrExit(error = aMessage.Append(&tlv, sizeof(tlv)));

tests/scripts/Makefile.am

@@ -105,6 +105,7 @@ EXTRA_DIST                                                         = \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
+    thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_12_Announce.py                              \
     thread-cert/Cert_9_2_13_EnergyScan.py                            \
     thread-cert/Cert_9_2_14_PanIdQuery.py                            \
@@ -225,6 +226,7 @@ check_SCRIPTS                                                     += \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
+    thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_12_Announce.py                              \
     thread-cert/Cert_9_2_13_EnergyScan.py                            \
     thread-cert/Cert_9_2_14_PanIdQuery.py                            \
@@ -247,6 +249,7 @@ XFAIL_NCP_TESTS                                                    = \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
+    thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_12_Announce.py                              \
     thread-cert/Cert_9_2_13_EnergyScan.py                            \
     thread-cert/Cert_9_2_14_PanIdQuery.py                            \

tests/scripts/thread-cert/Cert_9_2_07_DelayTimer.py

@@ -52,25 +52,22 @@ class Cert_9_2_7_DelayTimer(unittest.TestCase):
         for i in range(1,4):
             self.nodes[i] = node.Node(i)
 
-        self.nodes[COMMISSIONER].set_panid(PANID_INIT)
+        self.nodes[COMMISSIONER].set_active_dataset(LEADER_ACTIVE_TIMESTAMP, 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(LEADER_ACTIVE_TIMESTAMP)
-        self.nodes[LEADER].set_panid(PANID_INIT)
+        self.nodes[LEADER].set_active_dataset(LEADER_ACTIVE_TIMESTAMP, 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].enable_whitelist()
         self.nodes[LEADER].set_router_selection_jitter(1)
 
-        self.nodes[ROUTER].set_active_dataset(ROUTER_ACTIVE_TIMESTAMP)
+        self.nodes[ROUTER].set_active_dataset(ROUTER_ACTIVE_TIMESTAMP, panid=PANID_INIT)
         self.nodes[ROUTER].set_pending_dataset(ROUTER_PENDING_TIMESTAMP, ROUTER_PENDING_ACTIVE_TIMESTAMP)
-        self.nodes[ROUTER].set_panid(PANID_INIT)
         self.nodes[ROUTER].set_mode('rsdn')
-        self.nodes[ROUTER].set_partition_id(0)
         self.nodes[ROUTER].enable_whitelist()
         self.nodes[ROUTER].set_router_selection_jitter(1)
 
@@ -100,6 +97,12 @@ class Cert_9_2_7_DelayTimer(unittest.TestCase):
         self.assertEqual(self.nodes[LEADER].get_state(), 'leader')
         self.assertEqual(self.nodes[ROUTER].get_state(), 'router')
 
+        ipaddrs = self.nodes[ROUTER].get_addrs()
+        for ipaddr in ipaddrs:
+            if ipaddr[0:4] != 'fe80':
+                break
+        self.assertTrue(self.nodes[LEADER].ping(ipaddr))
+
         self.nodes[COMMISSIONER].send_mgmt_pending_set(pending_timestamp=40,
                                                        active_timestamp=80,
                                                        delay_timer=10000,
@@ -118,7 +121,6 @@ class Cert_9_2_7_DelayTimer(unittest.TestCase):
         for ipaddr in ipaddrs:
             if ipaddr[0:4] != 'fe80':
                 break
-
         self.assertTrue(self.nodes[LEADER].ping(ipaddr))
 
 if __name__ == '__main__':

tests/scripts/thread-cert/Cert_9_2_09_PendingPartition.py

@@ -0,0 +1,148 @@
+#!/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
+
+CHANNEL_FINAL = 19
+PANID_FINAL = 0xabcd
+
+COMMISSIONER = 1
+LEADER = 2
+ROUTER1 = 3
+ROUTER2 = 4
+
+class Cert_9_2_09_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(10, 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(10, 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(10, 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(10, 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)
+        self.nodes[ROUTER2].set_network_id_timeout(100)
+
+    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[ROUTER2].start()
+        time.sleep(5)
+        self.assertEqual(self.nodes[ROUTER2].get_state(), 'router')
+
+        self.nodes[COMMISSIONER].send_mgmt_pending_set(pending_timestamp=30,
+                                                       active_timestamp=210,
+                                                       delay_timer=500000,
+                                                       channel=20,
+                                                       panid=0xafce)
+        time.sleep(5)
+
+        self.nodes[LEADER].remove_whitelist(self.nodes[ROUTER1].get_addr64())
+        self.nodes[ROUTER1].remove_whitelist(self.nodes[LEADER].get_addr64())
+        time.sleep(130)
+
+        self.assertEqual(self.nodes[ROUTER1].get_state(), 'router')
+        self.assertEqual(self.nodes[ROUTER2].get_state(), 'leader')
+
+        self.nodes[ROUTER2].send_mgmt_pending_set(pending_timestamp=50,
+                                                  active_timestamp=410,
+                                                  delay_timer=200000,
+                                                  channel=CHANNEL_FINAL,
+                                                  panid=PANID_FINAL)
+        time.sleep(5)
+
+        self.nodes[LEADER].add_whitelist(self.nodes[ROUTER1].get_addr64())
+        self.nodes[ROUTER1].add_whitelist(self.nodes[LEADER].get_addr64())
+        time.sleep(200)
+
+        self.assertEqual(self.nodes[ROUTER1].get_state(), 'router')
+        self.assertEqual(self.nodes[ROUTER2].get_state(), 'router')
+
+        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)
+
+        self.assertEqual(self.nodes[COMMISSIONER].get_channel(), CHANNEL_FINAL)
+        self.assertEqual(self.nodes[LEADER].get_channel(), CHANNEL_FINAL)
+        self.assertEqual(self.nodes[ROUTER1].get_channel(), CHANNEL_FINAL)
+        self.assertEqual(self.nodes[ROUTER2].get_channel(), CHANNEL_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()