NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-09 01:49:35 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Closes #20459 : clean is_oob and is_primary on bulk_import (#20657)

Browse Source
This commit is contained in:
Pl0xym0r 2025-10-25 17:10:20 +02:00 committed by GitHub
parent 639bc4462b
commit dbfdf318ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,6 +369,20 @@ class IPAddressImportForm(NetBoxModelImportForm):
**{f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data['virtual_machine']} **{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): def clean(self):
super().clean() super().clean()
@ -411,18 +425,18 @@ class IPAddressImportForm(NetBoxModelImportForm):
ipaddress = super().save(*args, **kwargs) ipaddress = super().save(*args, **kwargs)
# Set as primary for device/VM # 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') parent = self.cleaned_data.get('device') or self.cleaned_data.get('virtual_machine')
if self.instance.address.version == 4: 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: 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() parent.save()
# Set as OOB for device # 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 = self.cleaned_data.get('device')
parent.oob_ip = ipaddress parent.oob_ip = ipaddress if self.cleaned_data.get('is_oob') else None
parent.save() parent.save()
return ipaddress return ipaddress