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

Merge pull request #360 from coreemu/enhancement/coretk-global-ip6

Browse source 
updates for coretk to default to assigning global ip6 addresses
This commit is contained in:
bharnden 2020-01-28 11:30:33 -08:00 • committed by GitHub
commit 7cc52f13d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
daemon/core/gui/coreclient.py
View file

@ -803,18 +803,26 @@ class CoreClient:
def create_interface(self, canvas_node: CanvasNode) -> core_pb2.Interface:
node = canvas_node.core_node
ip4, ip6, prefix = self.interfaces_manager.get_ips(node.id)
ip4, ip6 = self.interfaces_manager.get_ips(node.id)
ip4_mask = self.interfaces_manager.ip4_mask
ip6_mask = self.interfaces_manager.ip6_mask
interface_id = len(canvas_node.interfaces)
name = f"eth{interface_id}"
interface = core_pb2.Interface(
id=interface_id, name=name, ip4=ip4, ip4mask=prefix, ip6=ip6, ip6mask=prefix
id=interface_id,
name=name,
ip4=ip4,
ip4mask=ip4_mask,
ip6=ip6,
ip6mask=ip6_mask,
)
canvas_node.interfaces.append(interface)
logging.debug(
"create node(%s) interface IPv4: %s, name: %s",
"create node(%s) interface(%s) IPv4(%s) IPv6(%s)",
node.name,
interface.ip4,
interface.name,
interface.ip4,
interface.ip6,
)
return interface
@ -829,7 +837,7 @@ class CoreClient:
dst_node = canvas_dst_node.core_node
# determine subnet
self.interfaces_manager.determine_subnet(canvas_src_node, canvas_dst_node)
self.interfaces_manager.determine_subnets(canvas_src_node, canvas_dst_node)
src_interface = None
if NodeUtils.is_container_node(src_node.type):