Add Thread Certification 8.2.1 to automated test. (#822)

src/core/meshcop/joiner.cpp

@@ -62,6 +62,7 @@ Joiner::Joiner(ThreadNetif &aNetif):
     mTransmitMessage(NULL),
     mSocket(aNetif.GetIp6().mUdp),
     mTransmitTask(aNetif.GetIp6().mTaskletScheduler, &Joiner::HandleUdpTransmit, this),
+    mTimer(aNetif.GetIp6().mTimerScheduler, &Joiner::HandleTimer, this),
     mJoinerEntrust(OPENTHREAD_URI_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this),
     mNetif(aNetif)
 {
@@ -326,7 +327,6 @@ void Joiner::HandleJoinerEntrust(Coap::Header &aHeader, Message &aMessage, const
     ExtendedPanIdTlv extendedPanId;
     NetworkNameTlv networkName;
     ActiveTimestampTlv activeTimestamp;
-    Mac::ExtAddress extAddress;
 
     VerifyOrExit(aHeader.GetType() == Coap::Header::kTypeConfirmable &&
                  aHeader.GetCode() == Coap::Header::kCodePost, error = kThreadError_Drop);
@@ -356,7 +356,23 @@ void Joiner::HandleJoinerEntrust(Coap::Header &aHeader, Message &aMessage, const
 
     otLogInfoMeshCoP("join success!\r\n");
 
-    // configure a random Extended Address
+    // Delay extended address configuration to allow DTLS wrap up.
+    mTimer.Start(kConfigExtAddressDelay);
+
+exit:
+    (void)aMessageInfo;
+    return;
+}
+
+void Joiner::HandleTimer(void *aContext)
+{
+    static_cast<Joiner *>(aContext)->HandleTimer();
+}
+
+void Joiner::HandleTimer(void)
+{
+    Mac::ExtAddress extAddress;
+
     for (size_t i = 0; i < sizeof(extAddress); i++)
     {
         extAddress.m8[i] = static_cast<uint8_t>(otPlatRandomGet());
@@ -364,10 +380,6 @@ void Joiner::HandleJoinerEntrust(Coap::Header &aHeader, Message &aMessage, const
 
     mNetif.GetMac().SetExtAddress(extAddress);
     mNetif.GetMle().UpdateLinkLocalAddress();
-
-exit:
-    (void)aMessageInfo;
-    return;
 }
 
 void Joiner::Close(void)

src/core/meshcop/joiner.hpp

@@ -80,6 +80,11 @@ public:
     ThreadError Stop(void);
 
 private:
+    enum
+    {
+        kConfigExtAddressDelay = 100,  ///< milliseconds
+    };
+
     static void HandleDiscoverResult(otActiveScanResult *aResult, void *aContext);
     void HandleDiscoverResult(otActiveScanResult *aResult);
 
@@ -99,6 +104,9 @@ private:
                                     Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
     void HandleJoinerEntrust(Coap::Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
 
+    static void HandleTimer(void *aContext);
+    void HandleTimer(void);
+
     void Close(void);
     void ReceiveJoinerFinalizeResponse(uint8_t *buf, uint16_t length);
     void SendJoinerFinalize(void);
@@ -111,6 +119,7 @@ private:
     Ip6::UdpSocket mSocket;
 
     Tasklet mTransmitTask;
+    Timer mTimer;
     Coap::Resource mJoinerEntrust;
     ThreadNetif &mNetif;
 };

tests/scripts/Makefile.am

@@ -105,6 +105,7 @@ EXTRA_DIST                                                         = \
     thread-cert/Cert_7_1_05_BorderRouterAsRouter.py                  \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
+    thread-cert/Cert_8_2_01_JoinerRouter.py                          \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
     thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_10_PendingPartition.py                      \
@@ -233,6 +234,7 @@ check_SCRIPTS                                                     += \
     thread-cert/Cert_7_1_05_BorderRouterAsRouter.py                  \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
+    thread-cert/Cert_8_2_01_JoinerRouter.py                          \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
     thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_10_PendingPartition.py                      \
@@ -262,6 +264,7 @@ TESTS                                                              = \
 XFAIL_NCP_TESTS                                                    = \
     thread-cert/Cert_8_1_01_Commissioning.py                         \
     thread-cert/Cert_8_1_02_Commissioning.py                         \
+    thread-cert/Cert_8_2_01_JoinerRouter.py                          \
     thread-cert/Cert_9_2_07_DelayTimer.py                            \
     thread-cert/Cert_9_2_09_PendingPartition.py                      \
     thread-cert/Cert_9_2_10_PendingPartition.py                      \

tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py

@@ -0,0 +1,107 @@
+#!/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
+
+COMMISSIONER = 1
+JOINER_ROUTER = 2
+JOINER = 3
+
+class Cert_8_2_01_JoinerRouter(unittest.TestCase):
+    def setUp(self):
+        self.nodes = {}
+        for i in range(1,4):
+            self.nodes[i] = node.Node(i)
+
+        self.nodes[COMMISSIONER].set_panid(0xface)
+        self.nodes[COMMISSIONER].set_mode('rsdn')
+        self.nodes[COMMISSIONER].set_masterkey('deadbeefdeadbeefdeadbeefdeadbeef')
+        self.nodes[COMMISSIONER].enable_whitelist()
+        self.nodes[COMMISSIONER].set_router_selection_jitter(1)
+
+        self.nodes[JOINER_ROUTER].set_mode('rsdn')
+        self.nodes[JOINER_ROUTER].set_masterkey('00112233445566778899aabbccddeeff')
+        self.nodes[JOINER_ROUTER].enable_whitelist()
+        self.nodes[JOINER_ROUTER].set_router_selection_jitter(1)
+
+        self.nodes[JOINER].set_mode('rsdn')
+        self.nodes[JOINER].set_masterkey('00112233445566778899aabbccddeeff')
+        self.nodes[JOINER].enable_whitelist()
+        self.nodes[JOINER].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[COMMISSIONER].interface_up()
+        self.nodes[COMMISSIONER].thread_start()
+        time.sleep(5)
+        self.assertEqual(self.nodes[COMMISSIONER].get_state(), 'leader')
+
+        self.nodes[COMMISSIONER].commissioner_start()
+        time.sleep(5)
+        self.nodes[COMMISSIONER].commissioner_add_joiner(self.nodes[JOINER_ROUTER].get_hashmacaddr(), 'openthread')
+        self.nodes[COMMISSIONER].commissioner_add_joiner(self.nodes[JOINER].get_hashmacaddr(), 'openthread2')
+        time.sleep(5)
+
+        self.nodes[COMMISSIONER].add_whitelist(self.nodes[JOINER_ROUTER].get_hashmacaddr())
+        self.nodes[JOINER_ROUTER].add_whitelist(self.nodes[COMMISSIONER].get_addr64())
+
+        self.nodes[JOINER_ROUTER].interface_up()
+        self.nodes[JOINER_ROUTER].joiner_start('openthread')
+        time.sleep(10)
+        self.assertEqual(self.nodes[JOINER_ROUTER].get_masterkey(), self.nodes[COMMISSIONER].get_masterkey())
+
+        self.nodes[COMMISSIONER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
+
+        self.nodes[JOINER_ROUTER].thread_start()
+        time.sleep(5)
+        self.assertEqual(self.nodes[JOINER_ROUTER].get_state(), 'router')
+
+        self.nodes[JOINER_ROUTER].add_whitelist(self.nodes[JOINER].get_hashmacaddr())
+        self.nodes[JOINER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
+
+        self.nodes[JOINER].interface_up()
+        self.nodes[JOINER].joiner_start('openthread2')
+        time.sleep(10)
+        self.assertEqual(self.nodes[JOINER].get_masterkey(), self.nodes[COMMISSIONER].get_masterkey())
+
+        self.nodes[JOINER_ROUTER].add_whitelist(self.nodes[JOINER].get_addr64())
+
+        self.nodes[JOINER].thread_start()
+        time.sleep(5)
+        self.assertEqual(self.nodes[JOINER].get_state(), 'router')
+
+if __name__ == '__main__':
+    unittest.main()