Skip to content

attempt to fix updating a NIC with a missing MAC #386

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

attempt to fix updating a NIC with a missing MAC #386

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
17 changes: 16 additions & 1 deletion netbox_agent/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,13 @@ def get_network_cards(self):

def get_netbox_network_card(self, nic):
if config.network.nic_id == "mac" and nic["mac"]:
# First try to find by MAC address
interface = self.nb_net.interfaces.get(mac_address=nic["mac"], **self.custom_arg_id)
if interface:
return interface
# If not found by MAC, try by name (in case interface exists but doesn't have MAC)
interface = self.nb_net.interfaces.get(name=nic["name"], **self.custom_arg_id)
return interface
else:
interface = self.nb_net.interfaces.get(name=nic["name"], **self.custom_arg_id)
return interface
Expand Down Expand Up @@ -467,6 +473,8 @@ def _nic_identifier(self, nic):
"%s: MAC not available while trying to use it as the NIC identifier",
nic.name,
)
# Fall back to name when MAC is not available
return nic.name
return nic.mac_address
return nic.name

Expand All @@ -478,8 +486,15 @@ def create_or_update_netbox_network_cards(self):
# delete unknown interface
nb_nics = list(self.get_netbox_network_cards())
local_nics = [self._nic_identifier(x) for x in self.nics]
local_nic_names = [x["name"] for x in self.nics] # Also track names for fallback comparison
for nic in list(nb_nics):
if self._nic_identifier(nic) not in local_nics:
nic_identifier = self._nic_identifier(nic)
if nic_identifier not in local_nics:
# If nic_id is "mac" and the interface doesn't have a MAC, also check by name
if (config.network.nic_id == "mac" and
not nic.mac_address and
nic.name in local_nic_names):
continue # Interface exists by name, don't delete it
logging.info(
"Deleting netbox interface {name} because not present locally".format(
name=nic.name
Expand Down