[otci] add backward compability (#6780)

This commit is contained in:
Simon Lin
2021-07-06 11:31:54 -07:00
committed by GitHub
parent 48b129e74b
commit 478fb1e3a3
+11 -6
View File
@@ -363,13 +363,14 @@ class OTCI(object):
return self.__parse_str(self.execute_command('networkname'))
def get_network_key(self) -> str:
"""Get the network network key."""
return self.__parse_network_key(self.execute_command('networkkey'))
"""Get the network key."""
return self.__parse_network_key(self.execute_command(self.__detect_networkkey_cmd()))
def set_network_key(self, networkkey: str):
"""Set the network network key."""
"""Set the network key."""
self.__validate_network_key(networkkey)
self.execute_command(f'networkkey {networkkey}')
cmd = self.__detect_networkkey_cmd()
self.execute_command(f'{cmd} {networkkey}')
def get_key_sequence_counter(self) -> int:
"""Get the Thread Key Sequence Counter."""
@@ -1674,7 +1675,7 @@ class OTCI(object):
dataset['extpanid'] = val
elif key == 'Mesh Local Prefix':
dataset['mesh_local_prefix'] = val
elif key == 'Network Key':
elif key in ('Network Key', 'Master Key'):
dataset['networkkey'] = val
elif key == 'Network Name':
dataset['network_name'] = val
@@ -1728,7 +1729,8 @@ class OTCI(object):
self.execute_command(f'dataset meshlocalprefix {mesh_local_prefix}')
if network_key is not None:
self.execute_command(f'dataset networkkey {network_key}')
nwk_cmd = self.__detect_networkkey_cmd()
self.execute_command(f'dataset {nwk_cmd} {network_key}')
if network_name is not None:
self.execute_command(f'dataset networkname {self.__escape_escapable(network_name)}')
@@ -1801,6 +1803,9 @@ class OTCI(object):
else:
return '\x77\x68\x69\x74\x65\x6c\x69\x73\x74'
def __detect_networkkey_cmd(self) -> str:
return 'networkkey' if self.api_version >= 126 else 'masterkey'
#
# Unicast Addresses management
#