Skip to content

network: resolve primary_mac_address by MAC object id #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomatomov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

network: resolve primary_mac_address by MAC object id #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion netbox_agent/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,16 @@ def batched(it, n):
if version.parse(nb.version) < version.parse("4.2"):
interface.mac_address = nic["mac"]
else:
interface.primary_mac_address = {"mac_address": nic["mac"]}
# Resolve the MAC object scoped to THIS interface so the
# lookup is unambiguous when the same MAC string exists on
# multiple interfaces (e.g. vlan/vxlan stacks, bonds, ipmi).
nb_mac_obj = self.nb_net.mac_addresses.get(
interface_id=interface.id, mac_address=nic["mac"]
)
if nb_mac_obj:
interface.primary_mac_address = nb_mac_obj.id
else:
interface.primary_mac_address = {"mac_address": nic["mac"]}
nic_update += 1

if hasattr(interface, "mtu"):
Expand Down