starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-22 16:58:49 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2025-10-29 13:47:01 -04:00
parent bf83299a93 80f03daad6
commit 068d493cc6
107 changed files with 12674 additions and 10835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
netbox/ipam/forms/bulk_import.py
View File

@@ -368,6 +368,20 @@ class IPAddressImportForm(PrimaryModelImportForm):
**{f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data['virtual_machine']}
)
def clean_is_primary(self):
# Make sure is_primary is None when it's not included in the uploaded data
if 'is_primary' not in self.data:
return None
else:
return self.cleaned_data['is_primary']
def clean_is_oob(self):
# Make sure is_oob is None when it's not included in the uploaded data
if 'is_oob' not in self.data:
return None
else:
return self.cleaned_data['is_oob']
def clean(self):
super().clean()
@@ -410,18 +424,18 @@ class IPAddressImportForm(PrimaryModelImportForm):
ipaddress = super().save(*args, **kwargs)
# Set as primary for device/VM
if self.cleaned_data.get('is_primary'):
if self.cleaned_data.get('is_primary') is not None:
parent = self.cleaned_data.get('device') or self.cleaned_data.get('virtual_machine')
if self.instance.address.version == 4:
parent.primary_ip4 = ipaddress
parent.primary_ip4 = ipaddress if self.cleaned_data.get('is_primary') else None
elif self.instance.address.version == 6:
parent.primary_ip6 = ipaddress
parent.primary_ip6 = ipaddress if self.cleaned_data.get('is_primary') else None
parent.save()
# Set as OOB for device
if self.cleaned_data.get('is_oob'):
if self.cleaned_data.get('is_oob') is not None:
parent = self.cleaned_data.get('device')
parent.oob_ip = ipaddress
parent.oob_ip = ipaddress if self.cleaned_data.get('is_oob') else None
parent.save()
return ipaddress