Skip to content

Fixes: #15408 - Add primary_ip4 and primary_ip6 to bulk import form for VDC #17509

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

Merged
merged 6 commits into from
Sep 19, 2024
Merged

Fixes: #15408 - Add primary_ip4 and primary_ip6 to bulk import form for VDC #17509

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c265ef7
Add primary_ip4 and primary_ip6 to bulk import form for VDC
bctiemann Sep 16, 2024
972d2ec
Specify IPAddress querysets with address field accessor and labels
bctiemann Sep 16, 2024
eaa27f1
Filter primary_ip4/ip6 querysets to only those IPs available on the d…
bctiemann Sep 17, 2024
d6ebe3b
Fix comment
bctiemann Sep 17, 2024
c739d38
Make ipv6 help text more correct
bctiemann Sep 17, 2024
b9752fb
Shorten IPv6 example
jeremystretch Sep 19, 2024
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
28 changes: 26 additions & 2 deletions netbox/dcim/forms/bulk_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from dcim.constants import *
from dcim.models import *
from extras.models import ConfigTemplate
from ipam.models import VRF
from ipam.models import VRF, IPAddress
from netbox.forms import NetBoxModelImportForm
from tenancy.models import Tenant
from utilities.forms.fields import (
Expand Down Expand Up @@ -1435,9 +1435,33 @@ class VirtualDeviceContextImportForm(NetBoxModelImportForm):
label=_('Status'),
choices=VirtualDeviceContextStatusChoices,
)
primary_ip4 = CSVModelChoiceField(
label=_('Primary IPv4'),
queryset=IPAddress.objects.all(),
required=False,
to_field_name='address',
help_text=_('IPv4 address with mask, e.g. 1.2.3.4/24')
)
primary_ip6 = CSVModelChoiceField(
label=_('Primary IPv6'),
queryset=IPAddress.objects.all(),
required=False,
to_field_name='address',
help_text=_('IPv6 address with prefix length, e.g. 2001:db8::1/64')
)

class Meta:
fields = [
'name', 'device', 'status', 'tenant', 'identifier', 'comments',
'name', 'device', 'status', 'tenant', 'identifier', 'comments', 'primary_ip4', 'primary_ip6',
]
model = VirtualDeviceContext

def __init__(self, data=None, *args, **kwargs):
super().__init__(data, *args, **kwargs)

if data:

# Limit primary_ip4/ip6 querysets by assigned device
params = {f"interface__device__{self.fields['device'].to_field_name}": data.get('device')}
self.fields['primary_ip4'].queryset = self.fields['primary_ip4'].queryset.filter(**params)
self.fields['primary_ip6'].queryset = self.fields['primary_ip6'].queryset.filter(**params)