From 80d3a3b8fb72df96e916a561bae5b4fe2edb0019 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Tue, 11 Oct 2016 17:40:15 -0700 Subject: [PATCH] Don't Use Special IPv6 Addresses (#791) * Replace 200*::/64 with 2001:2:0:*::/64 --- .../thread-cert/Cert_5_2_05_AddressQuery.py | 4 +- .../thread-cert/Cert_5_3_03_AddressQuery.py | 4 +- .../Cert_5_3_07_DuplicateAddress.py | 8 ++-- .../thread-cert/Cert_5_3_10_AddressQuery.py | 4 +- ...1_NetworkDataRegisterBeforeAttachLeader.py | 16 ++++---- ...2_NetworkDataRegisterBeforeAttachRouter.py | 16 ++++---- ...03_NetworkDataRegisterAfterAttachLeader.py | 16 ++++---- ...04_NetworkDataRegisterAfterAttachRouter.py | 16 ++++---- ...05_NetworkDataRegisterAfterAttachRouter.py | 26 ++++++------ .../Cert_5_6_06_NetworkDataExpiration.py | 40 +++++++++---------- .../Cert_5_6_07_NetworkDataRequestREED.py | 6 +-- .../Cert_5_6_08_ContextManagement.py | 22 +++++----- .../Cert_5_6_09_NetworkDataForwarding.py | 18 ++++----- .../Cert_6_3_02_NetworkDataUpdate.py | 14 +++---- .../Cert_7_1_01_BorderRouterAsLeader.py | 16 ++++---- .../Cert_7_1_02_BorderRouterAsRouter.py | 16 ++++---- .../Cert_7_1_03_BorderRouterAsLeader.py | 16 ++++---- .../Cert_7_1_04_BorderRouterAsRouter.py | 16 ++++---- .../Cert_7_1_05_BorderRouterAsRouter.py | 34 ++++++++-------- 19 files changed, 154 insertions(+), 154 deletions(-) diff --git a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py index 074dedb5e..75f2d27b1 100755 --- a/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_2_05_AddressQuery.py @@ -105,8 +105,8 @@ class Cert_5_2_5_AddressQuery(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[BR1].get_state(), 'router') - self.nodes[BR1].add_prefix('2003::/64', 'paros') - self.nodes[BR1].add_prefix('2004::/64', 'paros') + self.nodes[BR1].add_prefix('2001:2:0:3::/64', 'paros') + self.nodes[BR1].add_prefix('2001:2:0:4::/64', 'paros') self.nodes[BR1].register_netdata() self.nodes[ED1].start() diff --git a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py index d328f65ed..586d37334 100755 --- a/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_03_AddressQuery.py @@ -92,8 +92,8 @@ class Cert_5_3_3_AddressQuery(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[BR].get_state(), 'router') - self.nodes[BR].add_prefix('2003::/64', 'paros') - self.nodes[BR].add_prefix('2004::/64', 'paros') + self.nodes[BR].add_prefix('2001:2:0:3::/64', 'paros') + self.nodes[BR].add_prefix('2001:2:0:4::/64', 'paros') self.nodes[BR].register_netdata() self.nodes[ROUTER2].start() diff --git a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py index b1879a15d..7537a1018 100755 --- a/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py +++ b/tests/scripts/thread-cert/Cert_5_3_07_DuplicateAddress.py @@ -111,14 +111,14 @@ class Cert_5_3_7_DuplicateAddress(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ED3].get_state(), 'child') - self.nodes[ROUTER2].add_prefix('2001::/64', 'paros') + self.nodes[ROUTER2].add_prefix('2001:2:0:1::/64', 'paros') self.nodes[ROUTER2].register_netdata() - self.nodes[ED1].add_ipaddr('2001::1') - self.nodes[ED2].add_ipaddr('2001::1') + self.nodes[ED1].add_ipaddr('2001:2:0:1::1') + self.nodes[ED2].add_ipaddr('2001:2:0:1::1') time.sleep(5) - self.assertTrue(self.nodes[ED3].ping('2001::1')) + self.assertTrue(self.nodes[ED3].ping('2001:2:0:1::1')) if __name__ == '__main__': unittest.main() diff --git a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py index 6cf4f8326..cb1830e36 100755 --- a/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py +++ b/tests/scripts/thread-cert/Cert_5_3_10_AddressQuery.py @@ -91,8 +91,8 @@ class Cert_5_3_10_AddressQuery(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[BR].get_state(), 'router') - self.nodes[BR].add_prefix('2003::/64', 'paros') - self.nodes[BR].add_prefix('2004::/64', 'paros') + self.nodes[BR].add_prefix('2001:2:0:3::/64', 'paros') + self.nodes[BR].add_prefix('2001:2:0:4::/64', 'paros') self.nodes[BR].register_netdata() self.nodes[ROUTER2].start() diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py index d7393ddf4..c01841631 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -77,8 +77,8 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(unittest.TestCase): self.nodes[LEADER].set_state('leader') self.assertEqual(self.nodes[LEADER].get_state(), 'leader') - self.nodes[LEADER].add_prefix('2001::/64', 'paros') - self.nodes[LEADER].add_prefix('2002::/64', 'paro') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[LEADER].register_netdata() self.nodes[ROUTER].start() @@ -94,17 +94,17 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(unittest.TestCase): self.assertEqual(self.nodes[SED1].get_state(), 'child') addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py index 43bdd58a8..47e154283 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -81,8 +81,8 @@ class Cert_5_6_2_NetworkDataRouterAsBr(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ROUTER].get_state(), 'router') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() self.nodes[ED1].start() @@ -94,17 +94,17 @@ class Cert_5_6_2_NetworkDataRouterAsBr(unittest.TestCase): self.assertEqual(self.nodes[SED1].get_state(), 'child') addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py index de92581b3..24004754f 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -89,24 +89,24 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED1].get_state(), 'child') - self.nodes[LEADER].add_prefix('2001::/64', 'paros') - self.nodes[LEADER].add_prefix('2002::/64', 'paro') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[LEADER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py index 580954f99..570b5e9de 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -89,24 +89,24 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED1].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py index 681627aee..be0ccb7c1 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -89,43 +89,43 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED1].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) - self.nodes[ROUTER].add_prefix('2003::/64', 'pacs') + self.nodes[ROUTER].add_prefix('2001:2:0:3::/64', 'pacs') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py index 26642131a..ed71045fc 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -89,63 +89,63 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED1].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) - self.nodes[ROUTER].add_prefix('2003::/64', 'pacs') + self.nodes[ROUTER].add_prefix('2001:2:0:3::/64', 'pacs') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) - self.nodes[ROUTER].remove_prefix('2003::/64') + self.nodes[ROUTER].remove_prefix('2001:2:0:3::/64') self.nodes[ROUTER].register_netdata() time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py index ea6c9a8fc..7ee00f814 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -81,7 +81,7 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase): self.nodes[LEADER].remove_whitelist(self.nodes[REED].get_addr64()) self.nodes[REED].remove_whitelist(self.nodes[LEADER].get_addr64()) - self.nodes[ROUTER].add_prefix('2003::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:3::/64', 'paros') self.nodes[ROUTER].register_netdata() time.sleep(2) @@ -92,9 +92,9 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase): time.sleep(10) addrs = self.nodes[REED].get_addrs() - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2003': + if addr[0:10] == '2001:2:0:3': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py index 3a1e7cc9f..cfc13bd58 100755 --- a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py +++ b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py @@ -78,46 +78,46 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ED].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') self.nodes[ROUTER].register_netdata() time.sleep(2) addrs = self.nodes[LEADER].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) - self.nodes[ROUTER].remove_prefix('2001::/64') + self.nodes[ROUTER].remove_prefix('2001:2:0:1::/64') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2001:2:0:1' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) - self.nodes[ROUTER].add_prefix('2002::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paros') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) time.sleep(5) - self.nodes[ROUTER].add_prefix('2003::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:3::/64', 'paros') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py index d12382fb9..8c77871b4 100755 --- a/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py +++ b/tests/scripts/thread-cert/Cert_5_6_09_NetworkDataForwarding.py @@ -101,29 +101,29 @@ class Cert_5_6_9_NetworkDataForwarding(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED].get_state(), 'child') - self.nodes[LEADER].add_prefix('2001::/64', 'paros', 'med') - self.nodes[LEADER].add_route('2002::/64', 'med') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros', 'med') + self.nodes[LEADER].add_route('2001:2:0:2::/64', 'med') self.nodes[LEADER].register_netdata() time.sleep(10) - self.nodes[ROUTER2].add_prefix('2001::/64', 'paros', 'low') - self.nodes[ROUTER2].add_route('2002::/64', 'high') + self.nodes[ROUTER2].add_prefix('2001:2:0:1::/64', 'paros', 'low') + self.nodes[ROUTER2].add_route('2001:2:0:2::/64', 'high') self.nodes[ROUTER2].register_netdata() time.sleep(10) - self.assertFalse(self.nodes[SED].ping('2002::1')) + self.assertFalse(self.nodes[SED].ping('2001:2:0:2::1')) self.assertFalse(self.nodes[SED].ping('2007::1')) - self.nodes[ROUTER2].remove_prefix('2001::/64') - self.nodes[ROUTER2].add_prefix('2001::/64', 'paros', 'high') + self.nodes[ROUTER2].remove_prefix('2001:2:0:1::/64') + self.nodes[ROUTER2].add_prefix('2001:2:0:1::/64', 'paros', 'high') self.nodes[ROUTER2].register_netdata() time.sleep(10) self.assertFalse(self.nodes[SED].ping('2007::1')) - self.nodes[ROUTER2].remove_prefix('2001::/64') - self.nodes[ROUTER2].add_prefix('2001::/64', 'paros', 'med') + self.nodes[ROUTER2].remove_prefix('2001:2:0:1::/64') + self.nodes[ROUTER2].add_prefix('2001:2:0:1::/64', 'paros', 'med') self.nodes[ROUTER2].register_netdata() time.sleep(10) diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py index 1dc11a73b..620713457 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -66,20 +66,20 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ED].get_state(), 'child') - self.nodes[LEADER].add_prefix('2001::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros') self.nodes[LEADER].register_netdata() time.sleep(5) addrs = self.nodes[ED].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001': + if addr[0:10] == '2001:2:0:1': self.assertTrue(self.nodes[LEADER].ping(addr)) self.nodes[LEADER].remove_whitelist(self.nodes[ED].get_addr64()) self.nodes[ED].remove_whitelist(self.nodes[LEADER].get_addr64()) - self.nodes[LEADER].add_prefix('2002::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paros') self.nodes[LEADER].register_netdata() time.sleep(5) @@ -88,10 +88,10 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py index 5f34fbcf0..fbfbbf03e 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -77,8 +77,8 @@ class Cert_7_1_1_BorderRouterAsLeader(unittest.TestCase): self.nodes[LEADER].set_state('leader') self.assertEqual(self.nodes[LEADER].get_state(), 'leader') - self.nodes[LEADER].add_prefix('2001::/64', 'paros') - self.nodes[LEADER].add_prefix('2002::/64', 'paro') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[LEADER].register_netdata() self.nodes[ROUTER].start() @@ -94,17 +94,17 @@ class Cert_7_1_1_BorderRouterAsLeader(unittest.TestCase): self.assertEqual(self.nodes[ED1].get_state(), 'child') addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py index d2b1bff74..1b72a009d 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -81,8 +81,8 @@ class Cert_7_1_2_BorderRouterAsRouter(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ROUTER].get_state(), 'router') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() self.nodes[ED2].start() @@ -94,17 +94,17 @@ class Cert_7_1_2_BorderRouterAsRouter(unittest.TestCase): self.assertEqual(self.nodes[SED2].get_state(), 'child') addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py index 02aa57d36..cda2c7236 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -89,23 +89,23 @@ class Cert_7_1_3_BorderRouterAsLeader(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[ED1].get_state(), 'child') - self.nodes[LEADER].add_prefix('2001::/64', 'paros') - self.nodes[LEADER].add_prefix('2002::/64', 'paro') + self.nodes[LEADER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[LEADER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[LEADER].register_netdata() time.sleep(5) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py index 39caff1c6..9b17ce24f 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -89,23 +89,23 @@ class Cert_7_1_4_BorderRouterAsRouter(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED2].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__': diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py index a2f67c2e0..9601d5e6a 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -89,43 +89,43 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase): time.sleep(5) self.assertEqual(self.nodes[SED2].get_state(), 'child') - self.nodes[ROUTER].add_prefix('2001::/64', 'paros') - self.nodes[ROUTER].add_prefix('2002::/64', 'paro') + self.nodes[ROUTER].add_prefix('2001:2:0:1::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:2::/64', 'paro') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2': self.assertTrue(self.nodes[LEADER].ping(addr)) - self.nodes[ROUTER].add_prefix('2003::/64', 'paros') + self.nodes[ROUTER].add_prefix('2001:2:0:3::/64', 'paros') self.nodes[ROUTER].register_netdata() time.sleep(5) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2' or addr[0:10] == '2001:2:0:3': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) - self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) - self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2001:2:0:1' in addr[0:10] for addr in addrs)) + self.assertFalse(any('2001:2:0:2' in addr[0:10] for addr in addrs)) + self.assertTrue(any('2001:2:0:3' in addr[0:10] for addr in addrs)) for addr in addrs: - if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003': + if addr[0:10] == '2001:2:0:1' or addr[0:10] == '2001:2:0:2' or addr[0:10] == '2001:2:0:3': self.assertTrue(self.nodes[LEADER].ping(addr)) if __name__ == '__main__':