afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: refactored all_link_data to links

Browse source
This commit is contained in:
Blake Harnden 2020-06-18 21:33:28 -07:00
parent b2ea8cbbf6
commit ca2b1c9e4c
13 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/nodes/network.py
View file

@ -831,7 +831,7 @@ class CtrlNet(CoreNetwork):
super().shutdown()
def all_link_data(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
def links(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
"""
Do not include CtrlNet in link messages describing this session.
@ -859,7 +859,7 @@ class PtpNet(CoreNetwork):
raise CoreError("ptp links support at most 2 network interfaces")
super().attach(iface)
def all_link_data(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
def links(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
"""
Build CORE API TLVs for a point-to-point link. One Link message
describes this network.
@ -1054,17 +1054,17 @@ class WlanNode(CoreNetwork):
for iface in self.get_ifaces():
iface.setposition()
def all_link_data(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
def links(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
"""
Retrieve all link data.
:param flags: message flags
:return: list of link data
"""
all_links = super().all_link_data(flags)
links = super().links(flags)
if self.model:
all_links.extend(self.model.all_link_data(flags))
return all_links
links.extend(self.model.links(flags))
return links
class TunnelNode(GreTapBridge):