feat(filtersets): Extend filter support for ACL source/destination

Adds support for filtering by aggregates, IP addresses, and IP ranges in
both source and destination fields. Updates filter fields for better
alignment with the extended ACL rules model.

Author: pheus

netbox_acls/filtersets.py

@@ -7,7 +7,7 @@
 from dcim.models import Device, Interface, Region, Site, SiteGroup, VirtualChassis
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from ipam.models import Prefix
+from ipam.models import Aggregate, IPAddress, IPRange, Prefix
 from netbox.filtersets import NetBoxModelFilterSet
 from virtualization.models import VirtualMachine, VMInterface
 
@@ -203,14 +203,50 @@ class ACLStandardRuleFilterSet(NetBoxModelFilterSet):
     )
 
     # Source
+    source_aggregate = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="name",
+        label=_("Source Aggregate (name)"),
+    )
+    source_aggregate_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="id",
+        label=_("Source Aggregate (ID)"),
+    )
+    source_ipaddress = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="name",
+        label=_("Source IP-Address (name)"),
+    )
+    source_ipaddress_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="id",
+        label=_("Source IP-Address (ID)"),
+    )
+    source_iprange = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="name",
+        label=_("Source IP-Range (name)"),
+    )
+    source_iprange_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="id",
+        label=_("Source IP-Range (ID)"),
+    )
     source_prefix = django_filters.ModelMultipleChoiceFilter(
-        field_name="source_prefix",
+        field_name="_source_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="name",
         label=_("Source Prefix (name)"),
     )
     source_prefix_id = django_filters.ModelMultipleChoiceFilter(
-        field_name="source_prefix",
+        field_name="_source_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="id",
         label=_("Source Prefix (ID)"),
@@ -222,17 +258,20 @@ class Meta:
         """
 
         model = ACLStandardRule
-        fields = ("id", "access_list", "index", "action")
+        fields = (
+            "id",
+            "access_list",
+            "index",
+            "action",
+            "source_type",
+            "source_id",
+        )
 
     def search(self, queryset, name, value):
         """
         Override the default search behavior for the django model.
         """
-        query = (
-            Q(access_list__name__icontains=value)
-            | Q(index__icontains=value)
-            | Q(action__icontains=value)
-        )
+        query = Q(access_list__name__icontains=value) | Q(index__icontains=value) | Q(action__icontains=value)
         return queryset.filter(query)
 
 
@@ -254,28 +293,100 @@ class ACLExtendedRuleFilterSet(NetBoxModelFilterSet):
     )
 
     # Source
+    source_aggregate = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="name",
+        label=_("Source Aggregate (name)"),
+    )
+    source_aggregate_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="id",
+        label=_("Source Aggregate (ID)"),
+    )
+    source_ipaddress = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="name",
+        label=_("Source IP-Address (name)"),
+    )
+    source_ipaddress_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="id",
+        label=_("Source IP-Address (ID)"),
+    )
+    source_iprange = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="name",
+        label=_("Source IP-Range (name)"),
+    )
+    source_iprange_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_source_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="id",
+        label=_("Source IP-Range (ID)"),
+    )
     source_prefix = django_filters.ModelMultipleChoiceFilter(
-        field_name="source_prefix",
+        field_name="_source_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="name",
         label=_("Source Prefix (name)"),
     )
     source_prefix_id = django_filters.ModelMultipleChoiceFilter(
-        field_name="source_prefix",
+        field_name="_source_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="id",
         label=_("Source Prefix (ID)"),
     )
 
     # Destination
+    destination_aggregate = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="name",
+        label=_("Destination Aggregate (name)"),
+    )
+    destination_aggregate_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_aggregate",
+        queryset=Aggregate.objects.all(),
+        to_field_name="id",
+        label=_("Destination Aggregate (ID)"),
+    )
+    destination_ipaddress = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="name",
+        label=_("Destination IP-Address (name)"),
+    )
+    destination_ipaddress_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_ipaddress",
+        queryset=IPAddress.objects.all(),
+        to_field_name="id",
+        label=_("Destination IP-Address (ID)"),
+    )
+    destination_iprange = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="name",
+        label=_("Destination IP-Range (name)"),
+    )
+    destination_iprange_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="_destination_iprange",
+        queryset=IPRange.objects.all(),
+        to_field_name="id",
+        label=_("Destination IP-Range (ID)"),
+    )
     destination_prefix = django_filters.ModelMultipleChoiceFilter(
-        field_name="destination_prefix",
+        field_name="_destination_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="name",
         label=_("Destination Prefix (name)"),
     )
     destination_prefix_id = django_filters.ModelMultipleChoiceFilter(
-        field_name="destination_prefix",
+        field_name="_destination_prefix",
         queryset=Prefix.objects.all(),
         to_field_name="id",
         label=_("Destination Prefix (ID)"),
@@ -287,7 +398,17 @@ class Meta:
         """
 
         model = ACLExtendedRule
-        fields = ("id", "access_list", "index", "action", "protocol")
+        fields = (
+            "id",
+            "access_list",
+            "index",
+            "action",
+            "source_type",
+            "source_id",
+            "destination_type",
+            "destination_id",
+            "protocol",
+        )
 
     def search(self, queryset, name, value):
         """