feat(filter): ACLStandardRule: Adding new Sources to the filter

Author: rvveber

netbox_acls/filtersets.py

@@ -181,7 +181,17 @@ class Meta:
         """
 
         model = ACLStandardRule
-        fields = ("id", "access_list", "index", "action")
+        fields = (
+            "id",
+            "access_list",
+            "index",
+            "action",
+            "source_prefix",
+            "source_iprange",
+            "source_ipaddress",
+            "source_aggregate",
+            "source_service",
+        )
 
     def search(self, queryset, name, value):
         """
@@ -191,6 +201,11 @@ def search(self, queryset, name, value):
             Q(access_list__name__icontains=value)
             | Q(index__icontains=value)
             | Q(action__icontains=value)
+            | Q(source_prefix__icontains=value)
+            | Q(source_iprange__icontains=value)
+            | Q(source_ipaddress__icontains=value)
+            | Q(source_aggregate__icontains=value)
+            | Q(source_service__icontains=value)
         )
         return queryset.filter(query)
 

netbox_acls/forms/filtersets.py

@@ -5,7 +5,13 @@
 from dcim.models import Device, Interface, Region, Site, SiteGroup, VirtualChassis
 from django import forms
 from django.utils.translation import gettext as _
-from ipam.models import Prefix
+from ipam.models import (
+    Prefix,
+    IPRange,
+    IPAddress,
+    Aggregate,
+    Service,
+)
 from netbox.forms import NetBoxModelFilterSetForm
 from utilities.forms.rendering import FieldSet
 from utilities.forms.fields import (
@@ -181,6 +187,31 @@ class ACLStandardRuleFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label="Source Prefix",
     )
+    source_prefix = DynamicModelMultipleChoiceField(
+        queryset=Prefix.objects.all(),
+        required=False,
+        label="Source Prefix",
+    )
+    source_iprange = DynamicModelMultipleChoiceField(
+        queryset=IPRange.objects.all(),
+        required=False,
+        label="Source IP-Range",
+    )
+    source_ipaddress = DynamicModelMultipleChoiceField(
+        queryset=IPAddress.objects.all(),
+        required=False,
+        label="Source IP-Address",
+    )
+    source_aggregate = DynamicModelMultipleChoiceField(
+        queryset=Aggregate.objects.all(),
+        required=False,
+        label="Source Aggregate",
+    )    
+    source_service = DynamicModelMultipleChoiceField(
+        queryset=Service.objects.all(),
+        required=False,
+        label="Source Service",
+    )
     action = forms.ChoiceField(
         choices=add_blank_choice(ACLRuleActionChoices),
         required=False,