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

Author: rvveber

netbox_acls/filtersets.py

@@ -221,7 +221,17 @@ class Meta:
         """
 
         model = ACLExtendedRule
-        fields = ("id", "access_list", "index", "action", "protocol")
+        fields = (
+            "id", 
+            "access_list", 
+            "index", 
+            "action", 
+            "protocol", 
+            "source_prefix",
+            "source_iprange",
+            "source_ipaddress",
+            "source_aggregate",
+            "source_service",
 
     def search(self, queryset, name, value):
         """
@@ -232,5 +242,10 @@ def search(self, queryset, name, value):
                 | Q(index__icontains=value)
                 | Q(action__icontains=value)
                 | Q(protocol__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

@@ -272,7 +272,31 @@ class ACLExtendedRuleFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label="Source Prefix",
     )
-    desintation_prefix = DynamicModelMultipleChoiceField(
+    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",
+    )
         queryset=Prefix.objects.all(),
         required=False,
         label="Destination Prefix",