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

Closes #18058 - Filter IPs by associated device and VM roles

Browse Source
This commit is contained in:
Rob Duffy 2024-11-23 23:35:35 +00:00
parent 9c7f2ec98c
commit 78cc4886a3
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/ipam/filtersets.py
View File

@ -610,6 +610,11 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
field_name='pk', field_name='pk',
label=_('Device (ID)'), label=_('Device (ID)'),
) )
device_role = MultiValueCharFilter(
method='filter_device',
field_name='role',
label=_('Device (role)'),
)
virtual_machine = MultiValueCharFilter( virtual_machine = MultiValueCharFilter(
method='filter_virtual_machine', method='filter_virtual_machine',
field_name='name', field_name='name',
@ -620,6 +625,11 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
field_name='pk', field_name='pk',
label=_('Virtual machine (ID)'), label=_('Virtual machine (ID)'),
) )
virtual_machine_role = MultiValueCharFilter(
method='filter_virtual_machine',
field_name='role',
label=_('Virtual machine (role)'),
)
interface = django_filters.ModelMultipleChoiceFilter( interface = django_filters.ModelMultipleChoiceFilter(
field_name='interface__name', field_name='interface__name',
queryset=Interface.objects.all(), queryset=Interface.objects.all(),

14
netbox/ipam/forms/filtersets.py
View File

@ -1,7 +1,7 @@
from django import forms from django import forms
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from dcim.models import Location, Rack, Region, Site, SiteGroup, Device from dcim.models import Location, Rack, Region, Site, SiteGroup, Device, DeviceRole
from ipam.choices import * from ipam.choices import *
from ipam.constants import * from ipam.constants import *
from ipam.models import * from ipam.models import *
@ -308,7 +308,7 @@ class IPAddressFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
), ),
FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')), FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')),
FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')),
FieldSet('device_id', 'virtual_machine_id', name=_('Device/VM')), FieldSet('device_id', 'virtual_machine_id', 'virtual_machine_role', name=_('Device/VM')),
) )
selector_fields = ('filter_id', 'q', 'region_id', 'group_id', 'parent', 'status', 'role') selector_fields = ('filter_id', 'q', 'region_id', 'group_id', 'parent', 'status', 'role')
parent = forms.CharField( parent = forms.CharField(
@ -346,11 +346,21 @@ class IPAddressFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
required=False, required=False,
label=_('Assigned Device'), label=_('Assigned Device'),
) )
device_role = DynamicModelMultipleChoiceField(
queryset=DeviceRole.objects.all(),
required=False,
label=_('Assigned Device Role'),
)
virtual_machine_id = DynamicModelMultipleChoiceField( virtual_machine_id = DynamicModelMultipleChoiceField(
queryset=VirtualMachine.objects.all(), queryset=VirtualMachine.objects.all(),
required=False, required=False,
label=_('Assigned VM'), label=_('Assigned VM'),
) )
virtual_machine_role = DynamicModelMultipleChoiceField(
queryset=DeviceRole.objects.all(),
required=False,
label=_('Assigned VM Role')
)
status = forms.MultipleChoiceField( status = forms.MultipleChoiceField(
label=_('Status'), label=_('Status'),
choices=IPAddressStatusChoices, choices=IPAddressStatusChoices,

8
netbox/ipam/tests/test_filtersets.py
View File

@ -1020,8 +1020,8 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests):
cluster = Cluster.objects.create(type=clustertype, name='Cluster 1') cluster = Cluster.objects.create(type=clustertype, name='Cluster 1')
virtual_machines = ( virtual_machines = (
VirtualMachine(name='Virtual Machine 1', cluster=cluster), VirtualMachine(name='Virtual Machine 1', cluster=cluster, role=role),
VirtualMachine(name='Virtual Machine 2', cluster=cluster), VirtualMachine(name='Virtual Machine 2', cluster=cluster, role=role),
VirtualMachine(name='Virtual Machine 3', cluster=cluster), VirtualMachine(name='Virtual Machine 3', cluster=cluster),
) )
VirtualMachine.objects.bulk_create(virtual_machines) VirtualMachine.objects.bulk_create(virtual_machines)
@ -1244,6 +1244,8 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'device': [devices[0].name, devices[1].name]} params = {'device': [devices[0].name, devices[1].name]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'device_role': [devices[0].role.pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
def test_virtual_machine(self): def test_virtual_machine(self):
vms = VirtualMachine.objects.all()[:2] vms = VirtualMachine.objects.all()[:2]
@ -1251,6 +1253,8 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests):
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'virtual_machine': [vms[0].name, vms[1].name]} params = {'virtual_machine': [vms[0].name, vms[1].name]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'virtual_machine_role': [vms[0].role.pk]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_interface(self): def test_interface(self):
interfaces = Interface.objects.all()[:2] interfaces = Interface.objects.all()[:2]