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

pygui implemented mac config and fixed issue with manually assigning mac addresses

Browse source
This commit is contained in:
Blake Harnden 2020-04-22 23:00:07 -07:00
parent 3394f0240a
commit 7054e606ae
5 changed files with 61 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
daemon/core/gui/interface.py
View file

@ -2,8 +2,10 @@ import logging
import random
from typing import TYPE_CHECKING, Set, Union
from netaddr import IPNetwork
import netaddr
from netaddr import EUI, IPNetwork
from core.gui import appconfig
from core.gui.nodeutils import NodeUtils
if TYPE_CHECKING:
@ -35,12 +37,15 @@ class InterfaceManager:
def __init__(self, app: "Application") -> None:
self.app = app
ip_config = self.app.guiconfig.get("ips", {})
ip4 = ip_config.get("ip4", "10.0.0.0")
ip6 = ip_config.get("ip6", "2001::")
ip4 = ip_config.get("ip4", appconfig.DEFAULT_IP4)
ip6 = ip_config.get("ip6", appconfig.DEFAULT_IP6)
self.ip4_mask = 24
self.ip6_mask = 64
self.ip4_subnets = IPNetwork(f"{ip4}/{self.ip4_mask}")
self.ip6_subnets = IPNetwork(f"{ip6}/{self.ip6_mask}")
mac = self.app.guiconfig.get("mac", appconfig.DEFAULT_MAC)
self.mac = EUI(mac)
self.current_mac = None
self.current_subnets = None
def update_ips(self, ip4: str, ip6: str) -> None:
@ -48,6 +53,17 @@ class InterfaceManager:
self.ip4_subnets = IPNetwork(f"{ip4}/{self.ip4_mask}")
self.ip6_subnets = IPNetwork(f"{ip6}/{self.ip6_mask}")
def reset_mac(self) -> None:
self.current_mac = self.mac
self.current_mac.dialect = netaddr.mac_unix_expanded
def next_mac(self) -> str:
mac = str(self.current_mac)
value = self.current_mac.value + 1
self.current_mac = EUI(value)
self.current_mac.dialect = netaddr.mac_unix_expanded
return mac
def next_subnets(self) -> Subnets:
# define currently used subnets
used_subnets = set()