Reverted unnecessary changes for NetBox 4.5 made to filtersets

netbox_dns/filtersets/dnssec_key_template.py

@@ -4,7 +4,6 @@
 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 (
@@ -22,10 +21,12 @@ class DNSSECKeyTemplateFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
     class Meta:
         model = DNSSECKeyTemplate
 
-        fields = ("id",)
+        fields = (
+            "id",
+            "name",
+            "description",
+        )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     type = django_filters.MultipleChoiceFilter(
         choices=DNSSECKeyTemplateTypeChoices,
     )

netbox_dns/filtersets/dnssec_policy.py

@@ -21,15 +21,16 @@ class Meta:
 
         fields = (
             "id",
-            "status",
+            "name",
+            "description",
             "inline_signing",
             "create_cdnskey",
             "use_nsec3",
             "nsec3_opt_out",
+            "nsec3_iterations",
+            "nsec3_salt_size",
         )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=DNSSECPolicyStatusChoices,
     )
@@ -57,8 +58,6 @@ class Meta:
     zone_propagation_delay = TimePeriodFilter()
     parent_ds_ttl = TimePeriodFilter()
     parent_propagation_delay = TimePeriodFilter()
-    nsec3_iterations = django_filters.NumberFilter()
-    nsec3_salt_size = django_filters.NumberFilter()
     zone = django_filters.ModelMultipleChoiceFilter(
         field_name="zones__name",
         queryset=Zone.objects.all(),

netbox_dns/filtersets/nameserver.py

@@ -4,7 +4,6 @@
 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
 
@@ -16,10 +15,12 @@ class NameServerFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
     class Meta:
         model = NameServer
 
-        fields = ("id",)
+        fields = (
+            "id",
+            "name",
+            "description",
+        )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     zone_id = django_filters.ModelMultipleChoiceFilter(
         field_name="zones",
         queryset=Zone.objects.all(),

netbox_dns/filtersets/record.py

@@ -24,21 +24,21 @@ class Meta:
 
         fields = (
             "id",
+            "name",
+            "description",
+            "fqdn",
+            "value",
             "disable_ptr",
             "managed",
         )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
-    fqdn = django_filters.CharFilter()
     ttl = TimePeriodFilter()
-    type = django_filters.MultipleChoiceFilter(
-        choices=RecordTypeChoices,
-    )
-    value = django_filters.CharFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=RecordStatusChoices,
     )
+    type = django_filters.MultipleChoiceFilter(
+        choices=RecordTypeChoices,
+    )
     zone_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Zone.objects.all(),
     )
@@ -76,7 +76,6 @@ class Meta:
         method="filter_ip_address",
     )
     active = django_filters.BooleanFilter()
-    managed = django_filters.BooleanFilter()
 
     def filter_ip_address(self, queryset, name, value):
         if not value:

netbox_dns/filtersets/record_template.py

@@ -4,7 +4,6 @@
 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
@@ -20,14 +19,14 @@ class Meta:
 
         fields = (
             "id",
+            "name",
+            "description",
             "record_name",
             "value",
             "ttl",
             "disable_ptr",
         )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     ttl = TimePeriodFilter()
     type = django_filters.MultipleChoiceFilter(
         choices=RecordTypeChoices,

netbox_dns/filtersets/registrar.py

@@ -1,10 +1,7 @@
-import django_filters
-
 from django.db.models import Q
 
 from netbox.filtersets import PrimaryModelFilterSet
 from utilities.filtersets import register_filterset
-from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import Registrar
 
@@ -16,16 +13,17 @@ class RegistrarFilterSet(PrimaryModelFilterSet):
     class Meta:
         model = Registrar
 
-        fields = ("id",)
-
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
-    iana_id = django_filters.CharFilter()
-    address = django_filters.CharFilter()
-    referral_url = django_filters.CharFilter()
-    whois_server = django_filters.CharFilter()
-    abuse_email = django_filters.CharFilter()
-    abuse_phone = django_filters.CharFilter()
+        fields = (
+            "id",
+            "name",
+            "description",
+            "iana_id",
+            "address",
+            "referral_url",
+            "whois_server",
+            "abuse_email",
+            "abuse_phone",
+        )
 
     def search(self, queryset, name, value):
         if not value.strip():

netbox_dns/filtersets/registration_contact.py

@@ -1,10 +1,7 @@
-import django_filters
-
 from django.db.models import Q
 
 from netbox.filtersets import PrimaryModelFilterSet
 from utilities.filtersets import register_filterset
-from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import RegistrationContact
 
@@ -16,22 +13,23 @@ class RegistrationContactFilterSet(PrimaryModelFilterSet):
     class Meta:
         model = RegistrationContact
 
-        fields = ("id",)
-
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
-    contact_id = django_filters.NumberFilter()
-    organization = django_filters.CharFilter()
-    street = django_filters.CharFilter()
-    city = django_filters.CharFilter()
-    state_province = django_filters.CharFilter()
-    postal_code = django_filters.CharFilter()
-    country = django_filters.CharFilter()
-    phone = django_filters.CharFilter()
-    phone_ext = django_filters.CharFilter()
-    fax = django_filters.CharFilter()
-    fax_ext = django_filters.CharFilter()
-    email = django_filters.CharFilter()
+        fields = (
+            "id",
+            "name",
+            "description",
+            "contact_id",
+            "organization",
+            "street",
+            "city",
+            "state_province",
+            "postal_code",
+            "country",
+            "phone",
+            "phone_ext",
+            "fax",
+            "fax_ext",
+            "email",
+        )
 
     def search(self, queryset, name, value):
         if not value.strip():

netbox_dns/filtersets/view.py

@@ -5,7 +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
@@ -20,11 +20,11 @@ class Meta:
 
         fields = (
             "id",
+            "name",
+            "description",
             "default_view",
         )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     prefix_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Prefix.objects.all(),
         field_name="prefixes",

netbox_dns/filtersets/zone.py

@@ -30,14 +30,18 @@ class Meta:
 
         fields = (
             "id",
+            "name",
+            "description",
+            "soa_rname",
+            "soa_serial",
             "soa_serial_auto",
             "rfc2317_parent_managed",
             "domain_status",
             "inline_signing",
+            "registry_domain_id",
+            "expiration_date",
         )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     status = django_filters.MultipleChoiceFilter(
         choices=ZoneStatusChoices,
     )
@@ -67,8 +71,6 @@ class Meta:
         field_name="soa_mname__name",
         to_field_name="name",
     )
-    soa_rname = django_filters.CharFilter()
-    soa_serial = django_filters.NumberFilter()
     soa_ttl = TimePeriodFilter()
     soa_refresh = TimePeriodFilter()
     soa_retry = TimePeriodFilter()
@@ -105,7 +107,6 @@ class Meta:
         field_name="registrar__name",
         to_field_name="name",
     )
-    registry_domain_id = django_filters.CharFilter()
     expiration_date = django_filters.DateFromToRangeFilter()
     domain_status = django_filters.MultipleChoiceFilter(
         choices=ZoneEPPStatusChoices,

netbox_dns/filtersets/zone_template.py

@@ -27,10 +27,13 @@ class ZoneTemplateFilterSet(TenancyFilterSet, PrimaryModelFilterSet):
     class Meta:
         model = ZoneTemplate
 
-        fields = ("id",)
+        fields = (
+            "id",
+            "name",
+            "description",
+            "soa_rname",
+        )
 
-    name = MultiValueCharFilter()
-    description = django_filters.CharFilter()
     record_template_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RecordTemplate.objects.all(),
         field_name="record_templates",
@@ -58,7 +61,6 @@ class Meta:
         field_name="soa_mname__name",
         to_field_name="name",
     )
-    soa_rname = django_filters.CharFilter()
     dnssec_policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DNSSECPolicy.objects.all(),
     )

netbox_dns/tests/dnssec_key_template/test_filtersets.py

@@ -58,7 +58,7 @@ def test_name(self):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
-        params = {"description__regex": r"Test [KC]SK"}
+        params = {"description": ["Test KSK", "Test CSK"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_type(self):

netbox_dns/tests/dnssec_policy/test_filtersets.py

@@ -161,7 +161,7 @@ def test_name(self):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
-        params = {"description__regex": r"Test DNSSEC Policy [12]"}
+        params = {"description": ["Test DNSSEC Policy 1", "Test DNSSEC Policy 2"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_status(self):
@@ -280,11 +280,11 @@ def test_nsec3_opt_out(self):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_nsec3_iterations(self):
-        params = {"nsec3_iterations__gt": 0}
+        params = {"nsec3_iterations": [1, 2, 3]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_nsec3_salt_size(self):
-        params = {"nsec3_salt_size__gt": 0}
+        params = {"nsec3_salt_size": [16, 32]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_key_template(self):

netbox_dns/tests/nameserver/test_filtersets.py

@@ -78,7 +78,7 @@ def test_name(self):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_description(self):
-        params = {"description__regex": r"Test Name Server [23]"}
+        params = {"description": ["Test Name Server 2", "Test Name Server 3"]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):