From b4b05314338e5ca5decb1c1ff3d15d749b0e93f1 Mon Sep 17 00:00:00 2001 From: Rongli Sun Date: Wed, 4 Dec 2019 18:16:31 +0800 Subject: [PATCH] [tests] replace get_addr_rloc() by get_rloc() (#4380) --- .../thread-cert/Cert_9_2_02_MGMTCommissionerSet.py | 4 ++-- tests/scripts/thread-cert/node.py | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py index 942c39314..1ab475025 100755 --- a/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py +++ b/tests/scripts/thread-cert/Cert_9_2_02_MGMTCommissionerSet.py @@ -119,7 +119,7 @@ class Cert_9_2_02_MGMTCommissionerSet(unittest.TestCase): COMMISSIONER ) msg = commissioner_messages.next_coap_message('0.02', uri_path='/c/cs') - rloc = ip_address(self.nodes[LEADER].get_addr_rloc()) + rloc = ip_address(self.nodes[LEADER].get_rloc()) leader_aloc = ip_address(self.nodes[LEADER].get_addr_leader_aloc()) command.check_coap_message( msg, @@ -220,7 +220,7 @@ class Cert_9_2_02_MGMTCommissionerSet(unittest.TestCase): ) # Step 15 - Send ICMPv6 Echo Request to Leader - leader_rloc = self.nodes[LEADER].get_addr_rloc() + leader_rloc = self.nodes[LEADER].get_rloc() self.assertTrue(self.nodes[COMMISSIONER].ping(leader_rloc)) diff --git a/tests/scripts/thread-cert/node.py b/tests/scripts/thread-cert/node.py index 65c46c219..70110ba1d 100755 --- a/tests/scripts/thread-cert/node.py +++ b/tests/scripts/thread-cert/node.py @@ -576,19 +576,6 @@ class Node: return None - def get_addr_rloc(self): - addrs = self.get_addrs() - for addr in addrs: - segs = addr.split(':') - if ( - segs[4] == '0' - and segs[5] == 'ff' - and segs[6] == 'fe00' - and segs[7] != 'fc00' - ): - return addr - return None - def get_addr_leader_aloc(self): addrs = self.get_addrs() for addr in addrs: