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

daemon: refactored usages of hwaddr to mac and be consistent everywhere

Browse source
This commit is contained in:
Blake Harnden 2020-06-16 23:25:26 -07:00
parent a1734c3bc0
commit f4671ab2b8
8 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/xml/emanexml.py
View file

@ -18,7 +18,7 @@ if TYPE_CHECKING:
from core.emane.emanemanager import EmaneManager
from core.emane.emanemodel import EmaneModel
_hwaddr_prefix = "02:02"
_MAC_PREFIX = "02:02"
def is_external(config: Dict[str, str]) -> bool:
@ -230,9 +230,9 @@ def build_node_platform_xml(
platform_element.append(nem_element)
node.setnemid(iface, nem_id)
macstr = _hwaddr_prefix + ":00:00:"
macstr = _MAC_PREFIX + ":00:00:"
macstr += f"{(nem_id >> 8) & 0xFF:02X}:{nem_id & 0xFF:02X}"
iface.sethwaddr(macstr)
iface.set_mac(macstr)
# increment nem id
nem_id += 1