From f0f44d60bd46b8493dca03054ea88600729c3ed8 Mon Sep 17 00:00:00 2001 From: Peter Eckel Date: Fri, 20 Mar 2026 10:25:43 +0100 Subject: [PATCH] Reverted unnecessary changes for NetBox 4.5 made to filtersets --- netbox_dns/filtersets/dnssec_key_template.py | 9 +++-- netbox_dns/filtersets/dnssec_policy.py | 9 ++--- netbox_dns/filtersets/nameserver.py | 9 +++-- netbox_dns/filtersets/record.py | 15 ++++--- netbox_dns/filtersets/record_template.py | 5 +-- netbox_dns/filtersets/registrar.py | 24 ++++++------ netbox_dns/filtersets/registration_contact.py | 36 ++++++++--------- netbox_dns/filtersets/view.py | 6 +-- netbox_dns/filtersets/zone.py | 11 +++--- netbox_dns/filtersets/zone_template.py | 10 +++-- .../dnssec_key_template/test_filtersets.py | 2 +- .../tests/dnssec_policy/test_filtersets.py | 6 +-- .../tests/nameserver/test_filtersets.py | 2 +- netbox_dns/tests/record/test_filtersets.py | 39 +++++++++++++++---- .../tests/record_template/test_filtersets.py | 2 +- netbox_dns/tests/registrar/test_filtersets.py | 16 ++++---- .../registration_contact/test_filtersets.py | 36 ++++++----------- netbox_dns/tests/view/test_filtersets.py | 2 +- netbox_dns/tests/zone/test_filtersets.py | 19 +++++---- .../tests/zone_template/test_filtersets.py | 12 ++++-- 20 files changed, 146 insertions(+), 124 deletions(-) diff --git a/netbox_dns/filtersets/dnssec_key_template.py b/netbox_dns/filtersets/dnssec_key_template.py index 0af87824..7a4ad5e0 100644 --- a/netbox_dns/filtersets/dnssec_key_template.py +++ b/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, ) diff --git a/netbox_dns/filtersets/dnssec_policy.py b/netbox_dns/filtersets/dnssec_policy.py index 69a36743..9924e5ae 100644 --- a/netbox_dns/filtersets/dnssec_policy.py +++ b/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(), diff --git a/netbox_dns/filtersets/nameserver.py b/netbox_dns/filtersets/nameserver.py index b1f537d9..2450a430 100755 --- a/netbox_dns/filtersets/nameserver.py +++ b/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(), diff --git a/netbox_dns/filtersets/record.py b/netbox_dns/filtersets/record.py index eae8cd19..1a3ccd05 100755 --- a/netbox_dns/filtersets/record.py +++ b/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: diff --git a/netbox_dns/filtersets/record_template.py b/netbox_dns/filtersets/record_template.py index 78066751..e1544cd4 100755 --- a/netbox_dns/filtersets/record_template.py +++ b/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, diff --git a/netbox_dns/filtersets/registrar.py b/netbox_dns/filtersets/registrar.py index 069d3a14..a43b5c8c 100644 --- a/netbox_dns/filtersets/registrar.py +++ b/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(): diff --git a/netbox_dns/filtersets/registration_contact.py b/netbox_dns/filtersets/registration_contact.py index 712fcd52..39388b25 100644 --- a/netbox_dns/filtersets/registration_contact.py +++ b/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(): diff --git a/netbox_dns/filtersets/view.py b/netbox_dns/filtersets/view.py index edf3182b..1a83f4ed 100644 --- a/netbox_dns/filtersets/view.py +++ b/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", diff --git a/netbox_dns/filtersets/zone.py b/netbox_dns/filtersets/zone.py index 1ac74a1c..25278fe9 100755 --- a/netbox_dns/filtersets/zone.py +++ b/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, diff --git a/netbox_dns/filtersets/zone_template.py b/netbox_dns/filtersets/zone_template.py index 6494434a..8df818a6 100755 --- a/netbox_dns/filtersets/zone_template.py +++ b/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(), ) diff --git a/netbox_dns/tests/dnssec_key_template/test_filtersets.py b/netbox_dns/tests/dnssec_key_template/test_filtersets.py index 46673777..f7aa2ced 100644 --- a/netbox_dns/tests/dnssec_key_template/test_filtersets.py +++ b/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): diff --git a/netbox_dns/tests/dnssec_policy/test_filtersets.py b/netbox_dns/tests/dnssec_policy/test_filtersets.py index a64c517c..c30222ec 100644 --- a/netbox_dns/tests/dnssec_policy/test_filtersets.py +++ b/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): diff --git a/netbox_dns/tests/nameserver/test_filtersets.py b/netbox_dns/tests/nameserver/test_filtersets.py index 89458310..f42fe214 100644 --- a/netbox_dns/tests/nameserver/test_filtersets.py +++ b/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): diff --git a/netbox_dns/tests/record/test_filtersets.py b/netbox_dns/tests/record/test_filtersets.py index d89fc657..fdb6e09b 100644 --- a/netbox_dns/tests/record/test_filtersets.py +++ b/netbox_dns/tests/record/test_filtersets.py @@ -113,7 +113,14 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_description(self): - params = {"description__iregex": r"test record [1-4]"} + params = { + "description": [ + "Test Record 1", + "Test Record 2", + "Test Record 3", + "Test Record 4", + ] + } self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_zone(self): @@ -123,10 +130,22 @@ def test_zone(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_fqdn(self): - params = {"fqdn__regex": r"name[124]\.zone1\..*"} + params = { + "fqdn": [ + "name1.zone1.example.com.", + "name2.zone1.example.com.", + "name4.zone1.example.com.", + ] + } + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = { + "fqdn": [ + "name1.zone2.example.com.", + "name2.zone2.example.com.", + "name2.zone1.example.", + ] + } self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = {"fqdn__iew": "zone2.example.com."} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_type(self): params = {"type": [RecordTypeChoices.A]} @@ -134,12 +153,18 @@ def test_type(self): params = {"type": [RecordTypeChoices.AAAA]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + def test_status(self): + params = {"status": [RecordStatusChoices.STATUS_INACTIVE]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + params = {"status": [RecordStatusChoices.STATUS_ACTIVE]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8) + def test_value(self): - params = {"value": "10.0.0.42"} + params = {"value": ["10.0.0.42"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = {"value": "fe80::dead:beef"} + params = {"value": ["fe80::dead:beef"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) - params = {"value__regex": r"(fe80::dead:beef|10.0.0.42)"} + params = {"value": ["fe80::dead:beef", "10.0.0.42"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6) def test_managed(self): diff --git a/netbox_dns/tests/record_template/test_filtersets.py b/netbox_dns/tests/record_template/test_filtersets.py index 7f1bec8c..1e2b3872 100644 --- a/netbox_dns/tests/record_template/test_filtersets.py +++ b/netbox_dns/tests/record_template/test_filtersets.py @@ -100,7 +100,7 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_description(self): - params = {"description__regex": r"Test Record Template [12]"} + params = {"description": ["Test Record Template 1", "Test Record Template 2"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_record_name(self): diff --git a/netbox_dns/tests/registrar/test_filtersets.py b/netbox_dns/tests/registrar/test_filtersets.py index c4365ae7..a0c510f0 100644 --- a/netbox_dns/tests/registrar/test_filtersets.py +++ b/netbox_dns/tests/registrar/test_filtersets.py @@ -51,29 +51,31 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_description(self): - params = {"description__regex": r"Test Registrar [12]"} + params = {"description": ["Test Registrar 1", "Test Registrar 3"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_iana_id(self): - params = {"iana_id__regex": r"(2323|4242|1234)"} + params = {"iana_id": [2323, 4242, 1234]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_referral_url(self): - params = {"referral_url": "https://acme.org"} + params = {"referral_url": ["https://acme.org"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_whois_server(self): - params = {"whois_server": "whois.acme.com"} + params = {"whois_server": ["whois.acme.com"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_address(self): - params = {"address__regex": r"(23 Limited Lane|007 Bond Street), Exampletown"} + params = { + "address": ["23 Limited Lane, Exampletown", "007 Bond Street, Exampletown"] + } self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_abuse_email(self): - params = {"abuse_email__regex": r"abuse@acme.(org|com)"} + params = {"abuse_email": ["abuse@acme.org", "abuse@acme.com"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) def test_abuse_phone(self): - params = {"abuse_phone__regex": r"\+49\.555\.[1,5]{4}"} + params = {"abuse_phone": ["+49.555.5555", "+49.555.1111"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) diff --git a/netbox_dns/tests/registration_contact/test_filtersets.py b/netbox_dns/tests/registration_contact/test_filtersets.py index cbee01a4..b0e3d7e4 100644 --- a/netbox_dns/tests/registration_contact/test_filtersets.py +++ b/netbox_dns/tests/registration_contact/test_filtersets.py @@ -15,7 +15,6 @@ def setUpTestData(cls): cls.contacts = ( RegistrationContact( name="Paul Example", - description="Test Contact 1", contact_id=4242, organization="Example Corp.", street="Example Avenue", @@ -31,7 +30,6 @@ def setUpTestData(cls): ), RegistrationContact( name="Fred Example", - description="Test Contact 2", contact_id=2323, organization="Example Corp.", street="Example Avenue", @@ -47,7 +45,6 @@ def setUpTestData(cls): ), RegistrationContact( name="Jack Example", - description="Test Contact 3", contact_id=4223, organization="Example Trust", street="Example Lane", @@ -68,55 +65,46 @@ def test_name(self): params = {"name": ["Fred Example", "Paul Example"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - def test_description(self): - params = {"description__regex": r"Test Contact [12]"} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - def test_contact_id(self): - params = {"contact_id": 2323} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) - params = {"contact_id__gt": 4000} + params = {"contact_id": [2323, 4223, 1234]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_organization(self): - params = {"organization": "Example Corp."} + params = {"organization": ["Example Corp."]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_street(self): - params = {"street": "Example Lane"} + params = {"street": ["Example Lane"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_city(self): - params = {"city": "Exampletown"} + params = {"city": ["Exampletown"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_state_province(self): - params = {"state_province": "Bad Example"} + params = {"state_province": ["Bad Example"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_postal_code(self): - params = {"postal_code__regex": r"(04242|00707)"} + params = {"postal_code": ["04242", "00707"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_country(self): - params = {"country__isw": "e"} + params = {"country": ["EX", "EY"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_phone(self): - params = {"phone__regex": r"\+49\.555\.(424242|1111)"} + params = {"phone": ["+49.555.424242", "+49.555.1111"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = {"phone__iregex": r"\+49\.555\.(424242|1111)", "phone_ext": "42"} + params = {"phone": ["+49.555.424242", "+49.555.1111"], "phone_ext": ["42"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_fax(self): - params = {"fax__regex": r"\+49\.555\.(424242|1111)"} + params = {"fax": ["+49.555.424242", "+49.555.11111"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = { - "fax__regex": r"\+49\.555\.(424242|1111)", - "fax_ext__regex": r"[21][24]", - } + params = {"fax": ["+49.555.424242", "+49.555.11111"], "fax_ext": ["32", "24"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_email(self): - params = {"email__regex": r"((paul|jack)@example|pete@acme)\.(com|org)"} + params = {"email": ["paul@example.com", "jack@example.org", "pete@acme.com"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) diff --git a/netbox_dns/tests/view/test_filtersets.py b/netbox_dns/tests/view/test_filtersets.py index 31d920f8..264e0259 100644 --- a/netbox_dns/tests/view/test_filtersets.py +++ b/netbox_dns/tests/view/test_filtersets.py @@ -42,7 +42,7 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_description(self): - params = {"description__regex": r"Test View [12]"} + params = {"description": ["Test View 1", "Test View 2"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_default_view(self): diff --git a/netbox_dns/tests/zone/test_filtersets.py b/netbox_dns/tests/zone/test_filtersets.py index 1205ca0f..e2dc0b5b 100644 --- a/netbox_dns/tests/zone/test_filtersets.py +++ b/netbox_dns/tests/zone/test_filtersets.py @@ -314,7 +314,7 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_description(self): - params = {"description__regex": r"Test Zone [1-3]"} + params = {"description": ["Test Zone 1", "Test Zone 2", "Test Zone 3"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) params = {"description__empty": False} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) @@ -352,14 +352,12 @@ def test_soa_mname(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_soa_rname(self): - params = {"soa_rname__regex": r"hostmaster\..*"} + params = {"soa_rname": ["hostmaster.example.com"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 9) - params = {"soa_rname__isw": "hostmaster2."} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_soa_serial(self): - params = {"soa_serial__gt": 1000000} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5) + params = {"soa_serial": [1]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8) def test_soa_ttl(self): params = {"soa_ttl": 86400} @@ -428,7 +426,14 @@ def test_registrar(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_registry_domain_id(self): - params = {"registry_domain_id__regex": r"^acme-00[12]"} + params = { + "registry_domain_id": [ + "acme-001-4242", + "acme-001-2323", + "acme-002-4242", + "acme-002-2323", + ] + } self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) def test_registrant(self): diff --git a/netbox_dns/tests/zone_template/test_filtersets.py b/netbox_dns/tests/zone_template/test_filtersets.py index 38d5c401..1fd60005 100644 --- a/netbox_dns/tests/zone_template/test_filtersets.py +++ b/netbox_dns/tests/zone_template/test_filtersets.py @@ -189,7 +189,13 @@ def test_name(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_descirption(self): - params = {"description__regex": r"Test Zone Template [129]"} + params = { + "description": [ + "Test Zone Template 1", + "Test Zone Template 2", + "Test Zone Template 9", + ] + } self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_nameserver(self): @@ -213,9 +219,7 @@ def test_soa_mname(self): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) def test_soa_rname(self): - params = {"soa_rname": "hostmaster.example.com"} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) - params = {"soa_rname__isw": "hostmaster2"} + params = {"soa_rname": ["hostmaster.example.com"]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) def test_record_template(self):