netbox-plugin-dns 1.1.4__tar.gz → 1.1.6__tar.gz

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.4
+Version: 1.1.6
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -25,6 +25,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://github.com/peteeckel/netbox-plugin-dns/pulls"><img src="https://img.shields.io/github/issues-pr/peteeckel/netbox-plugin-dns" alt="Pull Requests Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/peteeckel/netbox-plugin-dns?color=2b9348"></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/blob/master/LICENSE"><img src="https://img.shields.io/github/license/peteeckel/netbox-plugin-dns?color=2b9348" alt="License Badge"/></a>
+<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style Black"/></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads" src="https://static.pepy.tech/badge/netbox-plugin-dns"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Week" src="https://static.pepy.tech/badge/netbox-plugin-dns/month"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/README.md

@@ -9,6 +9,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://github.com/peteeckel/netbox-plugin-dns/pulls"><img src="https://img.shields.io/github/issues-pr/peteeckel/netbox-plugin-dns" alt="Pull Requests Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/peteeckel/netbox-plugin-dns?color=2b9348"></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/blob/master/LICENSE"><img src="https://img.shields.io/github/license/peteeckel/netbox-plugin-dns?color=2b9348" alt="License Badge"/></a>
+<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style Black"/></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads" src="https://static.pepy.tech/badge/netbox-plugin-dns"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Week" src="https://static.pepy.tech/badge/netbox-plugin-dns/month"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/__init__.py

@@ -1,12 +1,18 @@
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ImproperlyConfigured
 
 from netbox.plugins import PluginConfig
+from netbox.plugins.utils import get_plugin_config
 from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.4"
+__version__ = "1.1.6"
+
+
+def _check_list(setting):
+    if not isinstance(get_plugin_config("netbox_dns", setting), list):
+        raise ImproperlyConfigured(f"{setting} must be a list")
 
 
 class DNSConfig(PluginConfig):
@@ -53,7 +59,7 @@ class DNSConfig(PluginConfig):
         "enable_root_zones": False,
         "enforce_unique_records": True,
         "enforce_unique_rrset_ttl": True,
-        "menu_name": "NetBox DNS",
+        "menu_name": "DNS",
         "top_level_menu": True,
     }
     base_url = "netbox-dns"
@@ -61,10 +67,18 @@ class DNSConfig(PluginConfig):
     def ready(self):
         super().ready()
 
-        if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+        if not get_plugin_config("netbox_dns", "dnssync_disabled"):
             import netbox_dns.signals.ipam_dnssync  # noqa: F401
             import netbox_dns.tables.ipam_dnssync  # noqa: F401
 
+        for setting in (
+            "zone_active_status",
+            "record_active_status",
+            "dnssync_ipaddress_active_status",
+            "tolerate_leading_underscore_types",
+        ):
+            _check_list(setting)
+
 
 #
 # Initialize plugin config

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/api/views.py

@@ -57,7 +57,7 @@ class ZoneViewSet(NetBoxModelViewSet):
         "nameservers",
         "tags",
         "soa_mname",
-        "record_set",
+        "records",
         "tenant",
     )
     serializer_class = ZoneSerializer
@@ -71,7 +71,7 @@ class NameServerViewSet(NetBoxModelViewSet):
 
 
 class RecordViewSet(NetBoxModelViewSet):
-    queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")
+    queryset = Record.objects.prefetch_related("zone", "zone__view", "tenant")
     serializer_class = RecordSerializer
     filterset_class = RecordFilterSet
 

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/filtersets/record.py

@@ -92,7 +92,6 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "ttl",
             "value",
             "disable_ptr",
-            "active",
             "managed",
         )
 

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/filtersets/zone.py

@@ -3,7 +3,6 @@ import netaddr
 import django_filters
 from django.db.models import Q
 from django.utils.translation import gettext as _
-from django.utils.translation import pgettext as _p
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
@@ -28,7 +27,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=View.objects.all(),
         field_name="view__name",
         to_field_name="name",
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     # DEPRECATED: Remove in 1.1
     name_server_id = django_filters.ModelMultipleChoiceFilter(

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/forms/record.py

@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -46,9 +45,9 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         queryset=View.objects.all(),
         required=False,
         initial_params={
-            "zone": "$zone",
+            "zones": "$zone",
         },
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
@@ -187,23 +186,28 @@ class RecordImportForm(NetBoxModelImportForm):
                 pass
 
         if view is not None:
-            self.fields["zone"].queryset = Zone.objects.filter(view=view)
+            self.fields["zone"].queryset = view.zones
         else:
-            self.fields["zone"].queryset = Zone.objects.filter(
-                view=View.get_default_view()
-            )
+            self.fields["zone"].queryset = View.get_default_view().zones
 
     zone = CSVModelChoiceField(
         queryset=Zone.objects.all(),
         to_field_name="name",
         required=True,
         label=_("Zone"),
+        error_messages={
+            "invalid_choice": _("Zone %(value)s not found"),
+        },
     )
     view = CSVModelChoiceField(
         queryset=View.objects.all(),
         to_field_name="name",
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
+        error_messages={
+            "invalid_choice": _("View %(value)s not found"),
+        },
+        help_text=_("This field is required if the zone is not in the default view"),
     )
     type = CSVChoiceField(
         choices=RecordTypeChoices,

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/forms/view.py

@@ -3,7 +3,6 @@ from django.conf import settings
 from django.core.exceptions import ValidationError, FieldError
 from django.db.models import Q, Count
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -127,7 +126,7 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
     )
 
     fieldsets = (
-        FieldSet("name", "default_view", "description", name=_p("DNS", "View")),
+        FieldSet("name", "default_view", "description", name=_("View")),
         FieldSet("prefixes", "ip_address_filter"),
         FieldSet("tenant_group", "tenant", name=_("Tenancy")),
         FieldSet("tags", name=_("Tags")),
@@ -302,7 +301,7 @@ class ViewPrefixEditForm(forms.ModelForm):
 
         if not views.exists():
             if (parent := prefix.get_parents().last()) is not None:
-                check_views = parent.netbox_dns_views.all().difference(old_views)
+                check_views = parent.netbox_dns_views.difference(old_views)
 
         else:
             check_views = views.difference(old_views)

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/forms/zone.py

@@ -4,7 +4,6 @@ from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -385,7 +384,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     status = forms.MultipleChoiceField(
         choices=ZoneStatusChoices,
@@ -476,7 +475,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("View not found."),
+            "invalid_choice": _("View %(value)s not found"),
         },
         label=_("View"),
     )
@@ -505,7 +504,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Nameserver not found."),
+            "invalid_choice": _("Nameserver %(value)s not found"),
         },
         help_text=_("Primary nameserver for the zone"),
         label=_("SOA MName"),
@@ -560,7 +559,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Registrar not found."),
+            "invalid_choice": _("Registrar %(value)s not found"),
         },
         label=_("Registrar"),
     )
@@ -573,7 +572,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Registrant contact ID not found"),
+            "invalid_choice": _("Registrant contact ID %(value)s not found"),
         },
         label=_("Registrant"),
     )
@@ -582,7 +581,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Administrative contact ID not found"),
+            "invalid_choice": _("Administrative contact ID %(value)s not found"),
         },
         label=_("Administrative Contact"),
     )
@@ -591,7 +590,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Technical contact ID not found"),
+            "invalid_choice": _("Technical contact ID %(value)s not found"),
         },
         label=_("Technical Contact"),
     )
@@ -675,7 +674,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(ZoneStatusChoices),

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/forms/zone_template.py

@@ -159,7 +159,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Registrar not found."),
+            "invalid_choice": _("Registrar %(value)s not found"),
         },
         label=_("Registrar"),
     )
@@ -168,7 +168,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Registrant contact ID not found"),
+            "invalid_choice": _("Registrant contact ID %(value)s not found"),
         },
         label=_("Registrant"),
     )
@@ -177,7 +177,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Administrative contact ID not found"),
+            "invalid_choice": _("Administrative contact ID %(value)s not found"),
         },
         label=_("Administrative Contact"),
     )
@@ -186,7 +186,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Technical contact ID not found"),
+            "invalid_choice": _("Technical contact ID %(value)s not found"),
         },
         label=_("Technical Contact"),
     )
@@ -195,7 +195,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Billing contact ID not found"),
+            "invalid_choice": _("Billing contact ID %(value)s not found"),
         },
         label=_("Billing Contact"),
     )

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/graphql/types.py

@@ -35,6 +35,12 @@ class NetBoxDNSNameServerType(NetBoxObjectType):
     name: str
     description: str
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+    zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
+    soa_zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(View, fields="__all__", filters=NetBoxDNSViewFilter)
@@ -44,6 +50,9 @@ class NetBoxDNSViewType(NetBoxObjectType):
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
     prefixes: List[Annotated["PrefixType", strawberry.lazy("ipam.graphql.types")]]
     ip_address_filter: str | None
+    zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(Zone, fields="__all__", filters=NetBoxDNSZoneFilter)
@@ -111,6 +120,12 @@ class NetBoxDNSZoneType(NetBoxObjectType):
         Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
+    records: List[
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
+    rfc2317_child_zones: List[
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(Record, fields="__all__", filters=NetBoxDNSRecordFilter)
@@ -137,6 +152,13 @@ class NetBoxDNSRecordType(NetBoxObjectType):
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
+    address_record: (
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    rfc2317_ptr_records: List[
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(
@@ -157,6 +179,18 @@ class NetBoxDNSRegistrationContactType(NetBoxObjectType):
     fax: str
     fax_ext: str
     email: str
+    registrant_zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
+    admin_c_zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
+    tech_c_zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
+    billing_c_zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(Registrar, fields="__all__", filters=NetBoxDNSRegistrarFilter)
@@ -169,6 +203,9 @@ class NetBoxDNSRegistrarType(NetBoxObjectType):
     address: str
     abuse_email: str
     abuse_phone: str
+    zones: List[
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    ]
 
 
 @strawberry_django.type(

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/management/commands/cleanup_database.py

@@ -24,7 +24,7 @@ def zone_cleanup_ns_records(verbose=False):
         nameservers = zone.nameservers.all()
         nameserver_names = [f'{ns.name.rstrip(".")}.' for ns in nameservers]
 
-        delete_ns = zone.record_set.filter(
+        delete_ns = zone.records.filter(
             name=ns_name, type=RecordTypeChoices.NS
         ).exclude(value__in=nameserver_names)
         for record in delete_ns:
@@ -33,7 +33,7 @@ def zone_cleanup_ns_records(verbose=False):
             record.delete()
 
         for ns in nameserver_names:
-            ns_records = zone.record_set.filter(
+            ns_records = zone.records.filter(
                 name=ns_name,
                 type=RecordTypeChoices.NS,
                 value=ns,
@@ -46,7 +46,7 @@ def zone_cleanup_ns_records(verbose=False):
                 record.delete()
 
             try:
-                ns_record = zone.record_set.get(
+                ns_record = zone.records.get(
                     name=ns_name,
                     type=RecordTypeChoices.NS,
                     value=ns,
@@ -76,9 +76,7 @@ def zone_update_soa_records(verbose=False):
     soa_name = "@"
 
     for zone in Zone.objects.all():
-        delete_soa = zone.record_set.filter(name=soa_name, type=RecordTypeChoices.SOA)[
-            1:
-        ]
+        delete_soa = zone.records.filter(name=soa_name, type=RecordTypeChoices.SOA)[1:]
         for record in delete_soa:
             if verbose:
                 print(f"Deleting duplicate SOA record {record}")

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/management/commands/rebuild_dnssync.py

@@ -2,7 +2,7 @@ from django.core.management.base import BaseCommand
 
 from ipam.models import IPAddress
 
-from netbox_dns.utilities import update_dns_records
+from netbox_dns.utilities import update_dns_records, get_zones
 
 
 class Command(BaseCommand):
@@ -22,6 +22,8 @@ class Command(BaseCommand):
                 self.stdout.write(
                     f"Updating DNS records for IP Address {ip_address}, VRF {ip_address.vrf}"
                 )
+            if options.get("verbosity") >= 3:
+                self.stdout.write(f"  Zones: {get_zones(ip_address)}")
             if (
                 update_dns_records(ip_address, force=options.get("force"))
                 and options.get("verbosity") >= 1

netbox_plugin_dns-1.1.6/netbox_dns/migrations/0011_rename_related_fields.py

@@ -0,0 +1,63 @@
+# Generated by Django 5.0.9 on 2024-11-11 08:09
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0010_view_ip_address_filter"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="record",
+            name="zone",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="records",
+                to="netbox_dns.zone",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="zone",
+            name="registrant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="registrant_zones",
+                to="netbox_dns.registrationcontact",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="zone",
+            name="registrar",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="zones",
+                to="netbox_dns.registrar",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="zone",
+            name="soa_mname",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="soa_zones",
+                to="netbox_dns.nameserver",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="zone",
+            name="view",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="zones",
+                to="netbox_dns.view",
+            ),
+        ),
+    ]

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/mixins/object_modification.py

@@ -21,6 +21,10 @@ class ObjectModificationMixin:
 
     def _save_field_values(self):
         for field in self.check_fields:
+            if field == "custom_field_data":
+                self._saved_custom_field_data = self.custom_field_data.copy()
+                continue
+
             if f"{field}_id" in self.__dict__:
                 setattr(self, f"_saved_{field}_id", self.__dict__.get(f"{field}_id"))
             else:

{netbox_plugin_dns-1.1.4 → netbox_plugin_dns-1.1.6}/netbox_dns/models/nameserver.py

@@ -19,8 +19,6 @@ from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.validators import validate_fqdn
 from netbox_dns.mixins import ObjectModificationMixin
 
-from .record import Record
-
 
 __all__ = (
     "NameServer",
@@ -80,7 +78,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 {
                     "name": str(exc),
                 }
-            ) from None
+            )
 
         try:
             validate_fqdn(self.name)
@@ -89,7 +87,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 {
                     "name": exc,
                 }
-            ) from None
+            )
 
         super().clean(*args, **kwargs)
 
@@ -102,7 +100,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             super().save(*args, **kwargs)
 
             if changed_fields is not None and "name" in changed_fields:
-                soa_zones = self.zones_soa.all()
+                soa_zones = self.soa_zones.all()
                 for soa_zone in soa_zones:
                     soa_zone.update_soa_record()
 
@@ -112,10 +110,8 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def delete(self, *args, **kwargs):
         with transaction.atomic():
-            zones = self.zones.all()
-            for zone in zones:
-                Record.objects.filter(
-                    Q(zone=zone),
+            for zone in self.zones.all():
+                zone.records.filter(
                     Q(managed=True),
                     Q(value=f"{self.name}."),
                     Q(type=RecordTypeChoices.NS),