feat(forms): Add generic source and destination fields for ACL rules

Integrates generic object handling for source and destination fields in
ACLStandardRuleForm and ACLExtendedRuleForm. Introduces support for
content types, dynamic queries, and enhanced validation. Improves
alignment with the generic source/destination model update.

Author: pheus

netbox_acls/forms/filtersets.py

@@ -5,7 +5,7 @@
 from dcim.models import Device, Interface, Region, Site, SiteGroup, VirtualChassis
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from ipam.models import Prefix
+from ipam.models import Aggregate, IPAddress, IPRange, Prefix
 from netbox.forms import NetBoxModelFilterSetForm
 from utilities.forms.fields import (
     DynamicModelChoiceField,
@@ -45,17 +45,38 @@ class AccessListFilterForm(NetBoxModelFilterSetForm):
 
     model = AccessList
     fieldsets = (
-        FieldSet("q", "tag", name=None),
-        FieldSet("type", "default_action", name=_("ACL Details")),
-        FieldSet("region_id", "site_group_id", "site_id", "device_id", name=_("Device Details")),
-        FieldSet("virtual_chassis_id", name=_("Virtual Chassis Details")),
-        FieldSet("virtual_machine_id", name=_("Virtual Machine Details")),
+        FieldSet(
+            "q",
+            "tag",
+            name=None,
+        ),
+        FieldSet(
+            "type",
+            "default_action",
+            name=_("ACL Details"),
+        ),
+        FieldSet(
+            "region_id",
+            "site_group_id",
+            "site_id",
+            "device_id",
+            name=_("Device Details"),
+        ),
+        FieldSet(
+            "virtual_chassis_id",
+            name=_("Virtual Chassis Details"),
+        ),
+        FieldSet(
+            "virtual_machine_id",
+            name=_("Virtual Machine Details"),
+        ),
     )
 
-    # ACL
+    # ACL selector
     type = forms.ChoiceField(
         choices=add_blank_choice(ACLTypeChoices),
         required=False,
+        label=_("Type"),
     )
     default_action = forms.ChoiceField(
         choices=add_blank_choice(ACLActionChoices),
@@ -119,10 +140,29 @@ class ACLInterfaceAssignmentFilterForm(NetBoxModelFilterSetForm):
 
     model = ACLInterfaceAssignment
     fieldsets = (
-        FieldSet("q", "tag", name=None),
-        FieldSet("access_list_id", "direction", name=_("ACL Details")),
-        FieldSet("region_id", "site_group_id", "site_id", "device_id", "interface_id", name=_("Device Details")),
-        FieldSet("virtual_machine_id", "vminterface_id", name=_("Virtual Machine Details")),
+        FieldSet(
+            "q",
+            "tag",
+            name=None,
+        ),
+        FieldSet(
+            "access_list_id",
+            "direction",
+            name=_("ACL Details"),
+        ),
+        FieldSet(
+            "region_id",
+            "site_group_id",
+            "site_id",
+            "device_id",
+            "interface_id",
+            name=_("Device Details"),
+        ),
+        FieldSet(
+            "virtual_machine_id",
+            "vminterface_id",
+            name=_("Virtual Machine Details"),
+        ),
     )
 
     # ACL selector
@@ -202,9 +242,24 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
 
     model = ACLStandardRule
     fieldsets = (
-        FieldSet("q", "tag", name=None),
-        FieldSet("access_list_id", "index", "action", name=_("ACL Details")),
-        FieldSet("source_prefix_id", name=_("Source Details")),
+        FieldSet(
+            "q",
+            "tag",
+            name=None,
+        ),
+        FieldSet(
+            "access_list_id",
+            "index",
+            "action",
+            name=_("ACL Details"),
+        ),
+        FieldSet(
+            "source_aggregate_id",
+            "source_ipaddress_id",
+            "source_iprange_id",
+            "source_prefix_id",
+            name=_("Source Details"),
+        ),
     )
 
     access_list_id = DynamicModelMultipleChoiceField(
@@ -226,6 +281,21 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
     )
 
     # Source selectors
+    source_aggregate_id = DynamicModelMultipleChoiceField(
+        queryset=Aggregate.objects.all(),
+        required=False,
+        label=_("Source Aggregate"),
+    )
+    source_ipaddress_id = DynamicModelMultipleChoiceField(
+        queryset=IPAddress.objects.all(),
+        required=False,
+        label=_("Source IP-Address"),
+    )
+    source_iprange_id = DynamicModelMultipleChoiceField(
+        queryset=IPRange.objects.all(),
+        required=False,
+        label=_("Source IP-Range"),
+    )
     source_prefix_id = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
@@ -243,10 +313,32 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
 
     model = ACLExtendedRule
     fieldsets = (
-        FieldSet("q", "tag", name=None),
-        FieldSet("access_list_id", "index", "action", "protocol", name=_("ACL Details")),
-        FieldSet("source_prefix_id", name=_("Source Details")),
-        FieldSet("destination_prefix_id", name=_("Destination Details")),
+        FieldSet(
+            "q",
+            "tag",
+            name=None,
+        ),
+        FieldSet(
+            "access_list_id",
+            "index",
+            "action",
+            "protocol",
+            name=_("ACL Details"),
+        ),
+        FieldSet(
+            "source_aggregate_id",
+            "source_ipaddress_id",
+            "source_iprange_id",
+            "source_prefix_id",
+            name=_("Source Details"),
+        ),
+        FieldSet(
+            "destination_aggregate_id",
+            "destination_ipaddress_id",
+            "destination_iprange_id",
+            "destination_prefix_id",
+            name=_("Destination Details"),
+        ),
     )
 
     access_list_id = DynamicModelMultipleChoiceField(
@@ -273,13 +365,43 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
     )
 
     # Source selectors
+    source_aggregate_id = DynamicModelMultipleChoiceField(
+        queryset=Aggregate.objects.all(),
+        required=False,
+        label=_("Source Aggregate"),
+    )
+    source_ipaddress_id = DynamicModelMultipleChoiceField(
+        queryset=IPAddress.objects.all(),
+        required=False,
+        label=_("Source IP-Address"),
+    )
+    source_iprange_id = DynamicModelMultipleChoiceField(
+        queryset=IPRange.objects.all(),
+        required=False,
+        label=_("Source IP-Range"),
+    )
     source_prefix_id = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
         label=_("Source Prefix"),
     )
 
     # Destination selectors
+    destination_aggregate_id = DynamicModelMultipleChoiceField(
+        queryset=Aggregate.objects.all(),
+        required=False,
+        label=_("Destination Aggregate"),
+    )
+    destination_ipaddress_id = DynamicModelMultipleChoiceField(
+        queryset=IPAddress.objects.all(),
+        required=False,
+        label=_("Destination IP-Address"),
+    )
+    destination_iprange_id = DynamicModelMultipleChoiceField(
+        queryset=IPRange.objects.all(),
+        required=False,
+        label=_("Destination IP-Range"),
+    )
     destination_prefix_id = DynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,