Changed the filter type for model names to MultiValueCharFilter

peteeckel · peteeckel · commit 1edf98ca640d · 2026-03-20T09:59:37.000+01:00
diff --git a/netbox_dns/filtersets/dnssec_key_template.py b/netbox_dns/filtersets/dnssec_key_template.py
@@ -4,6 +4,7 @@
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import DNSSECKeyTemplate, DNSSECPolicy
 from netbox_dns.choices import (
@@ -23,7 +24,7 @@ class Meta:
 
         fields = ("id",)
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     type = django_filters.MultipleChoiceFilter(
         choices=DNSSECKeyTemplateTypeChoices,
diff --git a/netbox_dns/filtersets/dnssec_policy.py b/netbox_dns/filtersets/dnssec_policy.py
@@ -4,8 +4,8 @@
 
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
-from utilities.filters import MultiValueCharFilter
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate, Zone, ZoneTemplate
 from netbox_dns.choices import DNSSECPolicyStatusChoices
@@ -28,7 +28,7 @@ class Meta:
             "nsec3_opt_out",
         )
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=DNSSECPolicyStatusChoices,
diff --git a/netbox_dns/filtersets/nameserver.py b/netbox_dns/filtersets/nameserver.py
@@ -4,6 +4,7 @@
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import NameServer, Zone
 
@@ -17,7 +18,7 @@ class Meta:
 
         fields = ("id",)
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     zone_id = django_filters.ModelMultipleChoiceFilter(
         field_name="zones",
diff --git a/netbox_dns/filtersets/record.py b/netbox_dns/filtersets/record.py
@@ -5,8 +5,8 @@
 
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
-from utilities.filters import MultiValueCharFilter
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from ipam.models import IPAddress
 
@@ -28,7 +28,7 @@ class Meta:
             "managed",
         )
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     fqdn = django_filters.CharFilter()
     ttl = TimePeriodFilter()
diff --git a/netbox_dns/filtersets/record_template.py b/netbox_dns/filtersets/record_template.py
@@ -4,6 +4,7 @@
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import RecordTemplate, ZoneTemplate
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
@@ -25,7 +26,7 @@ class Meta:
             "disable_ptr",
         )
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     ttl = TimePeriodFilter()
     type = django_filters.MultipleChoiceFilter(
diff --git a/netbox_dns/filtersets/registrar.py b/netbox_dns/filtersets/registrar.py
@@ -4,6 +4,7 @@
 
 from netbox.filtersets import PrimaryModelFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import Registrar
 
@@ -17,7 +18,7 @@ class Meta:
 
         fields = ("id",)
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     iana_id = django_filters.CharFilter()
     address = django_filters.CharFilter()
diff --git a/netbox_dns/filtersets/registration_contact.py b/netbox_dns/filtersets/registration_contact.py
@@ -4,6 +4,7 @@
 
 from netbox.filtersets import PrimaryModelFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import RegistrationContact
 
@@ -17,7 +18,7 @@ class Meta:
 
         fields = ("id",)
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     contact_id = django_filters.NumberFilter()
     organization = django_filters.CharFilter()
diff --git a/netbox_dns/filtersets/view.py b/netbox_dns/filtersets/view.py
@@ -5,6 +5,7 @@
 from netbox.filtersets import PrimaryModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filtersets import register_filterset
+from utilities.filters import MultiValueCharFilter
 from ipam.models import Prefix
 
 from netbox_dns.models import View
@@ -22,7 +23,7 @@ class Meta:
             "default_view",
         )
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     prefix_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Prefix.objects.all(),
diff --git a/netbox_dns/filtersets/zone.py b/netbox_dns/filtersets/zone.py
@@ -36,7 +36,7 @@ class Meta:
             "inline_signing",
         )
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=ZoneStatusChoices,
diff --git a/netbox_dns/filtersets/zone_template.py b/netbox_dns/filtersets/zone_template.py
@@ -29,7 +29,7 @@ class Meta:
 
         fields = ("id",)
 
-    name = django_filters.CharFilter()
+    name = MultiValueCharFilter()
     description = django_filters.CharFilter()
     record_template_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RecordTemplate.objects.all(),
diff --git a/netbox_dns/tests/dnssec_key_template/test_filtersets.py b/netbox_dns/tests/dnssec_key_template/test_filtersets.py
@@ -54,7 +54,7 @@ def setUpTestData(cls):
         cls.dnssec_policies[1].key_templates.set(cls.dnssec_key_templates[2:3])
 
     def test_name(self):
-        params = {"name__regex": r"Test [KC]SK"}
+        params = {"name": ["Test KSK", "Test CSK"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/dnssec_policy/test_filtersets.py b/netbox_dns/tests/dnssec_policy/test_filtersets.py
@@ -157,7 +157,7 @@ def setUpTestData(cls):
         cls.dnssec_policies[2].key_templates.set([cls.dnssec_key_templates[1]])
 
     def test_name(self):
-        params = {"name__regex": r"Test Policy [12]"}
+        params = {"name": ["Test Policy 1", "Test Policy 2"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/nameserver/test_filtersets.py b/netbox_dns/tests/nameserver/test_filtersets.py
@@ -74,7 +74,7 @@ def setUpTestData(cls):
         )
 
     def test_name(self):
-        params = {"name__regex": r"ns[12].example.com"}
+        params = {"name": ["ns1.example.com", "ns2.example.com"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/record/test_filtersets.py b/netbox_dns/tests/record/test_filtersets.py
@@ -109,7 +109,7 @@ def setUpTestData(cls):
             record.save()
 
     def test_name(self):
-        params = {"name__regex": r"name[12]"}
+        params = {"name": ["name1", "name2"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_description(self):
diff --git a/netbox_dns/tests/record_template/test_filtersets.py b/netbox_dns/tests/record_template/test_filtersets.py
@@ -96,7 +96,7 @@ def setUpTestData(cls):
         cls.zone_templates[2].record_templates.set(cls.record_templates[3:6])
 
     def test_name(self):
-        params = {"name__regex": r"Test Record Template [13]"}
+        params = {"name": ["Test Record Template 1", "Test Record Template 3"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/registrar/test_filtersets.py b/netbox_dns/tests/registrar/test_filtersets.py
@@ -47,7 +47,7 @@ def setUpTestData(cls):
         Registrar.objects.bulk_create(cls.registrars)
 
     def test_name(self):
-        params = {"name__regex": r"ACME 2 (Corporation|Trust)"}
+        params = {"name": ["ACME 2 Corporation", "ACME 2 Trust"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/registration_contact/test_filtersets.py b/netbox_dns/tests/registration_contact/test_filtersets.py
@@ -65,7 +65,7 @@ def setUpTestData(cls):
         RegistrationContact.objects.bulk_create(cls.contacts)
 
     def test_name(self):
-        params = {"name__regex": r"(Fred|Paul) Example"}
+        params = {"name": ["Fred Example", "Paul Example"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/view/test_filtersets.py b/netbox_dns/tests/view/test_filtersets.py
@@ -38,7 +38,7 @@ def setUpTestData(cls):
         View.objects.bulk_create(cls.views)
 
     def test_name(self):
-        params = {"name__regex": r"View [12]"}
+        params = {"name": ["View 1", "View 2"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
diff --git a/netbox_dns/tests/zone/test_filtersets.py b/netbox_dns/tests/zone/test_filtersets.py
@@ -310,7 +310,7 @@ def setUpTestData(cls):
             )
 
     def test_name(self):
-        params = {"name__regex": r"zone[12].example.com"}
+        params = {"name": ["zone1.example.com", "zone2.example.com"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_description(self):
diff --git a/netbox_dns/tests/zone_template/test_filtersets.py b/netbox_dns/tests/zone_template/test_filtersets.py
@@ -185,7 +185,7 @@ def setUpTestData(cls):
             )
 
     def test_name(self):
-        params = {"name__regex": r"Zone Template [13]"}
+        params = {"name": ["Zone Template 1", "Zone Template 3"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_descirption(self):

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class Meta:`
`36`	`36`	`"inline_signing",`
`37`	`37`	`)`
`38`	`38`
`39`		`- name = django_filters.CharFilter()`
	`39`	`+ name = MultiValueCharFilter()`
`40`	`40`	`description = django_filters.CharFilter()`
`41`	`41`	`status = django_filters.MultipleChoiceFilter(`
`42`	`42`	`choices=ZoneStatusChoices,`