espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-03 15:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only check for string match against prefix, rather than entire address. (#687)

Browse Source
This commit is contained in:
Jonathan Hui
2016-09-26 13:23:18 -07:00
committed by GitHub
parent 6abc9808ac
commit 615102a51f
14 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py
+4 -4
View File
@@ -94,15 +94,15 @@ 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 word[0:4] for word in addrs))
self.assertTrue(any('2002' in word[0:4] for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED1].get_addrs()
self.assertTrue(any('2001' in word[0:4] for word in addrs))
self.assertFalse(any('2002' in word[0:4] for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py
+4 -4
View File
@@ -94,15 +94,15 @@ 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 word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py
+4 -4
View File
@@ -96,15 +96,15 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py
+4 -4
View File
@@ -96,15 +96,15 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py
+10 -10
View File
@@ -96,15 +96,15 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
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 word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[LEADER].ping(addr))
@@ -115,17 +115,17 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
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 word for word in addrs))
self.assertFalse(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py
+16 -16
View File
@@ -96,15 +96,15 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
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 word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[LEADER].ping(addr))
@@ -115,17 +115,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
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 word for word in addrs))
self.assertFalse(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[LEADER].ping(addr))
@@ -135,17 +135,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in addrs))
self.assertFalse(any('2003' in word for word in 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))
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 word for word in addrs))
self.assertFalse(any('2002' in word for word in addrs))
self.assertFalse(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py
+1 -1
View File
@@ -92,7 +92,7 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[REED].get_addrs()
self.assertTrue(any('2003' in word for word in addrs))
self.assertTrue(any('2003' in addr[0:4] for addr in addrs))
for addr in addrs:
if addr[0:4] == '2003':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py
+7 -7
View File
@@ -83,7 +83,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
time.sleep(2)
addrs = self.nodes[LEADER].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2001' in addr[0:4] for addr in addrs))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[ED].ping(addr))
@@ -93,7 +93,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
time.sleep(5)
addrs = self.nodes[LEADER].get_addrs()
self.assertFalse(any('2001' in word for word in addrs))
self.assertFalse(any('2001' in addr[0:4] for addr in addrs))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[ED].ping(addr))
@@ -103,8 +103,8 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
time.sleep(5)
addrs = self.nodes[LEADER].get_addrs()
self.assertFalse(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[ED].ping(addr))
@@ -115,9 +115,9 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase):
time.sleep(5)
addrs = self.nodes[LEADER].get_addrs()
self.assertFalse(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:3] == '200':
self.assertTrue(self.nodes[ED].ping(addr))
tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py
+3 -3
View File
@@ -71,7 +71,7 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase):
time.sleep(3)
addrs = self.nodes[ED].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2001' in addr[0:4] for addr in addrs))
for addr in addrs:
if addr[0:4] == '2001':
self.assertTrue(self.nodes[LEADER].ping(addr))
@@ -88,8 +88,8 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase):
time.sleep(10)
addrs = self.nodes[ED].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py
+4 -4
View File
@@ -94,15 +94,15 @@ 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 word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py
+4 -4
View File
@@ -94,15 +94,15 @@ 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 word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py
+4 -4
View File
@@ -95,15 +95,15 @@ class Cert_7_1_3_BorderRouterAsLeader(unittest.TestCase):
time.sleep(3)
addrs = self.nodes[SED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[ED1].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py
+4 -4
View File
@@ -95,15 +95,15 @@ class Cert_7_1_4_BorderRouterAsRouter(unittest.TestCase):
time.sleep(3)
addrs = self.nodes[ED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py
+10 -10
View File
@@ -95,15 +95,15 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase):
time.sleep(3)
addrs = self.nodes[ED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002':
self.assertTrue(self.nodes[LEADER].ping(addr))
@@ -113,17 +113,17 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase):
time.sleep(3)
addrs = self.nodes[ED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertTrue(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003':
self.assertTrue(self.nodes[LEADER].ping(addr))
addrs = self.nodes[SED2].get_addrs()
self.assertTrue(any('2001' in word for word in addrs))
self.assertFalse(any('2002' in word for word in addrs))
self.assertTrue(any('2003' in word for word in 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))
for addr in addrs:
if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003':
self.assertTrue(self.nodes[LEADER].ping(addr))