mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-21 11:37:21 -06:00
* add is_oob parameter on bulk_import ipaddress * Tweak wording --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
parent
674af4d6bc
commit
3326a6543c
@ -326,12 +326,17 @@ class IPAddressImportForm(NetBoxModelImportForm):
|
|||||||
help_text=_('Make this the primary IP for the assigned device'),
|
help_text=_('Make this the primary IP for the assigned device'),
|
||||||
required=False
|
required=False
|
||||||
)
|
)
|
||||||
|
is_oob = forms.BooleanField(
|
||||||
|
label=_('Is out-of-band'),
|
||||||
|
help_text=_('Designate this as the out-of-band IP address for the assigned device'),
|
||||||
|
required=False
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = IPAddress
|
model = IPAddress
|
||||||
fields = [
|
fields = [
|
||||||
'address', 'vrf', 'tenant', 'status', 'role', 'device', 'virtual_machine', 'interface', 'is_primary',
|
'address', 'vrf', 'tenant', 'status', 'role', 'device', 'virtual_machine', 'interface', 'is_primary',
|
||||||
'dns_name', 'description', 'comments', 'tags',
|
'is_oob', 'dns_name', 'description', 'comments', 'tags',
|
||||||
]
|
]
|
||||||
|
|
||||||
def __init__(self, data=None, *args, **kwargs):
|
def __init__(self, data=None, *args, **kwargs):
|
||||||
@ -345,7 +350,7 @@ class IPAddressImportForm(NetBoxModelImportForm):
|
|||||||
**{f"device__{self.fields['device'].to_field_name}": data['device']}
|
**{f"device__{self.fields['device'].to_field_name}": data['device']}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Limit interface queryset by assigned device
|
# Limit interface queryset by assigned VM
|
||||||
elif data.get('virtual_machine'):
|
elif data.get('virtual_machine'):
|
||||||
self.fields['interface'].queryset = VMInterface.objects.filter(
|
self.fields['interface'].queryset = VMInterface.objects.filter(
|
||||||
**{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']}
|
||||||
@ -358,16 +363,29 @@ class IPAddressImportForm(NetBoxModelImportForm):
|
|||||||
virtual_machine = self.cleaned_data.get('virtual_machine')
|
virtual_machine = self.cleaned_data.get('virtual_machine')
|
||||||
interface = self.cleaned_data.get('interface')
|
interface = self.cleaned_data.get('interface')
|
||||||
is_primary = self.cleaned_data.get('is_primary')
|
is_primary = self.cleaned_data.get('is_primary')
|
||||||
|
is_oob = self.cleaned_data.get('is_oob')
|
||||||
|
|
||||||
# Validate is_primary
|
# Validate is_primary and is_oob
|
||||||
if is_primary and not device and not virtual_machine:
|
if is_primary and not device and not virtual_machine:
|
||||||
raise forms.ValidationError({
|
raise forms.ValidationError({
|
||||||
"is_primary": _("No device or virtual machine specified; cannot set as primary IP")
|
"is_primary": _("No device or virtual machine specified; cannot set as primary IP")
|
||||||
})
|
})
|
||||||
|
if is_oob and not device:
|
||||||
|
raise forms.ValidationError({
|
||||||
|
"is_oob": _("No device specified; cannot set as out-of-band IP")
|
||||||
|
})
|
||||||
|
if is_oob and virtual_machine:
|
||||||
|
raise forms.ValidationError({
|
||||||
|
"is_oob": _("Cannot set out-of-band IP for virtual machines")
|
||||||
|
})
|
||||||
if is_primary and not interface:
|
if is_primary and not interface:
|
||||||
raise forms.ValidationError({
|
raise forms.ValidationError({
|
||||||
"is_primary": _("No interface specified; cannot set as primary IP")
|
"is_primary": _("No interface specified; cannot set as primary IP")
|
||||||
})
|
})
|
||||||
|
if is_oob and not interface:
|
||||||
|
raise forms.ValidationError({
|
||||||
|
"is_oob": _("No interface specified; cannot set as out-of-band IP")
|
||||||
|
})
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
|
|
||||||
@ -386,6 +404,12 @@ class IPAddressImportForm(NetBoxModelImportForm):
|
|||||||
parent.primary_ip6 = ipaddress
|
parent.primary_ip6 = ipaddress
|
||||||
parent.save()
|
parent.save()
|
||||||
|
|
||||||
|
# Set as OOB for device
|
||||||
|
if self.cleaned_data.get('is_oob'):
|
||||||
|
parent = self.cleaned_data.get('device')
|
||||||
|
parent.oob_ip = ipaddress
|
||||||
|
parent.save()
|
||||||
|
|
||||||
return ipaddress
|
return ipaddress
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user