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

daemon: refactored InterfaceData.get_addresses to InterfaceData.get_ips

Browse source
This commit is contained in:
Blake Harnden 2020-06-19 11:11:45 -07:00
parent 20feea8f12
commit 9e4429fbbc
5 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/nodes/physical.py
View file

@ -156,7 +156,7 @@ class PhysicalNode(CoreNodeBase):
self, net: CoreNetworkBase, iface_data: InterfaceData
) -> CoreInterface:
logging.info("creating interface")
addresses = iface_data.get_addresses()
ips = iface_data.get_ips()
iface_id = iface_data.id
if iface_id is None:
iface_id = self.next_iface_id()
@ -167,12 +167,12 @@ class PhysicalNode(CoreNodeBase):
# this is reached when this node is linked to a network node
# tunnel to net not built yet, so build it now and adopt it
_, remote_tap = self.session.distributed.create_gre_tunnel(net, self.server)
self.adopt_iface(remote_tap, iface_id, iface_data.mac, addresses)
self.adopt_iface(remote_tap, iface_id, iface_data.mac, ips)
return remote_tap
else:
# this is reached when configuring services (self.up=False)
iface = GreTap(node=self, name=name, session=self.session, start=False)
self.adopt_iface(iface, iface_id, iface_data.mac, addresses)
self.adopt_iface(iface, iface_id, iface_data.mac, ips)
return iface
def privatedir(self, path: str) -> None:
@ -316,8 +316,8 @@ class Rj45Node(CoreNodeBase):
self.iface_id = iface_id
if net is not None:
self.iface.attachnet(net)
for addr in iface_data.get_addresses():
self.add_ip(addr)
for ip in iface_data.get_ips():
self.add_ip(ip)
return self.iface
def delete_iface(self, iface_id: int) -> None: