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

improved netaddr mac dialect usage to leverage constructor parameter

Browse source
This commit is contained in:
Blake Harnden 2020-05-01 17:40:53 -07:00
parent 4ae5936bdc
commit 686026d9f2
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/utils.py
View file

@ -437,8 +437,7 @@ def random_mac() -> str:
"""
value = random.randint(0, 0xFFFFFF)
value |= 0x00163E << 24
mac = netaddr.EUI(value)
mac.dialect = netaddr.mac_unix_expanded
mac = netaddr.EUI(value, dialect=netaddr.mac_unix_expanded)
return str(mac)
@ -450,8 +449,7 @@ def validate_mac(value: str) -> str:
:return: unix formatted mac
"""
try:
mac = netaddr.EUI(value)
mac.dialect = netaddr.mac_unix_expanded
mac = netaddr.EUI(value, dialect=netaddr.mac_unix_expanded)
return str(mac)
except netaddr.AddrFormatError as e:
raise CoreError(f"invalid mac address {value}: {e}")