Skip to content

Fix #11478 - Add vc_interfaces flag to control selection of VC interfaces #13296

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 11 commits into from
Aug 30, 2023
Merged

Fix #11478 - Add vc_interfaces flag to control selection of VC interfaces #13296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b8284c
Add `vc_interfaces` flag to control interface queryset
DanSheps Jul 28, 2023
1f01dbc
Fix test failure
DanSheps Jul 28, 2023
e35d658
Merge branch '11478-fix-cabling-interface-display' of https://github.…
DanSheps Aug 11, 2023
a91c096
Add new filters instead of using undocumented query params
DanSheps Aug 11, 2023
e439a57
Cleanup filterset, add test
DanSheps Aug 11, 2023
5dba592
Rename filter and re-introduce virtual_chassis filtering method (requ…
DanSheps Aug 21, 2023
ef9b002
Fix test
DanSheps Aug 22, 2023
245fd2e
Adjust tests to more accurately provide coverage
DanSheps Aug 23, 2023
aceceba
Add breaking change note
DanSheps Aug 24, 2023
e9ec4b9
Merge branch 'feature' into 11478-fix-cabling-interface-display
DanSheps Aug 28, 2023
27fc44b
Misc cleanup
jeremystretch Aug 30, 2023
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
20 changes: 7 additions & 13 deletions netbox/dcim/filtersets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@ class InterfaceFilterSet(
label=_('Device'),
)
device_id = MultiValueNumberFilter(
method='filter_device_id',
method='filter_device',
field_name='pk',
label=_('Device (ID)'),
)
Expand Down Expand Up @@ -1511,22 +1511,16 @@ class Meta:
]

def filter_device(self, queryset, name, value):
try:
devices = Device.objects.filter(**{'{}__in'.format(name): value})
vc_interface_ids = []
for device in devices:
vc_interface_ids.extend(device.vc_interfaces().values_list('id', flat=True))
return queryset.filter(pk__in=vc_interface_ids)
except Device.DoesNotExist:
return queryset.none()

def filter_device_id(self, queryset, name, id_list):
# Include interfaces belonging to peer virtual chassis members
vc_interface_ids = []
try:
devices = Device.objects.filter(pk__in=id_list)
devices = Device.objects.filter(**{'{}__in'.format(name): value})
for device in devices:
vc_interface_ids += device.vc_interfaces(if_master=False).values_list('id', flat=True)
# Hack to show all VC member interfaces when requested
if 'vc_interfaces' in self.request.GET.keys():
vc_interface_ids += device.vc_interfaces(if_master=False).values_list('id', flat=True)
else:
vc_interface_ids.extend(device.vc_interfaces().values_list('id', flat=True))
return queryset.filter(pk__in=vc_interface_ids)
except Device.DoesNotExist:
return queryset.none()
Expand Down
3 changes: 3 additions & 0 deletions netbox/dcim/forms/model_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('Parent interface'),
query_params={
'device_id': '$device',
'vc_interfaces': 'all',
}
)
bridge = DynamicModelChoiceField(
Expand All @@ -1060,6 +1061,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('Bridged interface'),
query_params={
'device_id': '$device',
'vc_interfaces': 'all',
}
)
lag = DynamicModelChoiceField(
Expand All @@ -1068,6 +1070,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('LAG interface'),
query_params={
'device_id': '$device',
'vc_interfaces': 'all',
'type': 'lag',
}
)
Expand Down