NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 08:46:10 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add vc_interfaces flag to control interface queryset

Browse Source
This commit is contained in:
Daniel Sheppard 2023-07-28 11:17:35 -05:00
parent 006c353d46
commit 2b8284cb06
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/dcim/filtersets.py
View File

@ -1440,7 +1440,7 @@ class InterfaceFilterSet(
label=_('Device'), label=_('Device'),
) )
device_id = MultiValueNumberFilter( device_id = MultiValueNumberFilter(
method='filter_device_id', method='filter_device',
field_name='pk', field_name='pk',
label=_('Device (ID)'), label=_('Device (ID)'),
) )
@ -1511,22 +1511,16 @@ class InterfaceFilterSet(
] ]
def filter_device(self, queryset, name, value): 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 # Include interfaces belonging to peer virtual chassis members
vc_interface_ids = [] vc_interface_ids = []
try: try:
devices = Device.objects.filter(pk__in=id_list) devices = Device.objects.filter(**{'{}__in'.format(name): value})
for device in devices: for device in devices:
# 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) 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) return queryset.filter(pk__in=vc_interface_ids)
except Device.DoesNotExist: except Device.DoesNotExist:
return queryset.none() return queryset.none()

3
netbox/dcim/forms/model_forms.py
View File

@ -1052,6 +1052,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('Parent interface'), label=_('Parent interface'),
query_params={ query_params={
'device_id': '$device', 'device_id': '$device',
'vc_interfaces': 'all',
} }
) )
bridge = DynamicModelChoiceField( bridge = DynamicModelChoiceField(
@ -1060,6 +1061,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('Bridged interface'), label=_('Bridged interface'),
query_params={ query_params={
'device_id': '$device', 'device_id': '$device',
'vc_interfaces': 'all',
} }
) )
lag = DynamicModelChoiceField( lag = DynamicModelChoiceField(
@ -1068,6 +1070,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
label=_('LAG interface'), label=_('LAG interface'),
query_params={ query_params={
'device_id': '$device', 'device_id': '$device',
'vc_interfaces': 'all',
'type': 'lag', 'type': 'lag',
} }
) )