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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.5
+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

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

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.5"
+__version__ = "1.1.6"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.1.5 → 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

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

@@ -45,7 +45,7 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         queryset=View.objects.all(),
         required=False,
         initial_params={
-            "zone": "$zone",
+            "zones": "$zone",
         },
         label=_("View"),
     )
@@ -186,9 +186,9 @@ class RecordImportForm(NetBoxModelImportForm):
                 pass
 
         if view is not None:
-            self.fields["zone"].queryset = view.zone_set
+            self.fields["zone"].queryset = view.zones
         else:
-            self.fields["zone"].queryset = View.get_default_view().zone_set
+            self.fields["zone"].queryset = View.get_default_view().zones
 
     zone = CSVModelChoiceField(
         queryset=Zone.objects.all(),

{netbox_plugin_dns-1.1.5 → 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.5 → 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.5 → 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.5 → 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.5 → netbox_plugin_dns-1.1.6}/netbox_dns/models/nameserver.py

@@ -100,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()
 
@@ -111,7 +111,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def delete(self, *args, **kwargs):
         with transaction.atomic():
             for zone in self.zones.all():
-                zone.record_set.filter(
+                zone.records.filter(
                     Q(managed=True),
                     Q(value=f"{self.name}."),
                     Q(type=RecordTypeChoices.NS),

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/models/record.py

@@ -1,4 +1,5 @@
 import ipaddress
+import netaddr
 
 import dns
 from dns import name as dns_name
@@ -123,6 +124,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("Zone"),
         to="Zone",
         on_delete=models.CASCADE,
+        related_name="records",
     )
     fqdn = models.CharField(
         verbose_name=_("FQDN"),
@@ -320,7 +322,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def ptr_zone(self):
         if self.type == RecordTypeChoices.A:
             ptr_zone = (
-                self.zone.view.zone_set.filter(
+                self.zone.view.zones.filter(
                     rfc2317_prefix__net_contains=self.value,
                 )
                 .order_by("rfc2317_prefix__net_mask_length")
@@ -331,7 +333,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 return ptr_zone
 
         ptr_zone = (
-            self.zone.view.zone_set.filter(arpa_network__net_contains=self.value)
+            self.zone.view.zones.filter(arpa_network__net_contains=self.value)
             .order_by("arpa_network__net_mask_length")
             .last()
         )
@@ -451,7 +453,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
                 self.remove_from_rfc2317_cname_record(save_zone_serial=save_zone_serial)
 
-            rfc2317_cname_record = self.zone.rfc2317_parent_zone.record_set.filter(
+            rfc2317_cname_record = self.zone.rfc2317_parent_zone.records.filter(
                 name=cname_name,
                 type=RecordTypeChoices.CNAME,
                 managed=True,
@@ -601,7 +603,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if new_zone is None:
             new_zone = self.zone
 
-        records = new_zone.record_set.filter(
+        records = new_zone.records.filter(
             name=self.name,
             type=self.type,
             value=self.value,
@@ -637,7 +639,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if not get_plugin_config("netbox_dns", "dnssync_conflict_deactivate", False):
             return
 
-        records = self.zone.record_set.filter(
+        records = self.zone.records.filter(
             name=self.name,
             type=self.type,
             value=self.value,
@@ -665,7 +667,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             return
 
         records = (
-            self.zone.record_set.filter(
+            self.zone.records.filter(
                 name=self.name,
                 type=self.type,
             )
@@ -708,7 +710,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             ttl = self.ttl
 
         records = (
-            self.zone.record_set.filter(
+            self.zone.records.filter(
                 name=self.name,
                 type=self.type,
             )
@@ -736,7 +738,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if not self.is_active:
             return
 
-        records = self.zone.record_set.filter(name=self.name, active=True).exclude(
+        records = self.zone.records.filter(name=self.name, active=True).exclude(
             pk=self.pk
         )
 
@@ -755,7 +757,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 )
 
                 if (
-                    ptr_cname_zone.record_set.filter(
+                    ptr_cname_zone.records.filter(
                         name=ptr_cname_name,
                         active=True,
                     )
@@ -839,7 +841,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.ip_address = self.address_from_name
 
         elif self.is_address_record:
-            self.ip_address = self.value
+            self.ip_address = netaddr.IPAddress(self.value)
         else:
             self.ip_address = None
 
@@ -857,9 +859,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if changed_fields is None or changed_fields:
             super().save(*args, **kwargs)
 
-        _zone = self.zone
-        if self.type != RecordTypeChoices.SOA and _zone.soa_serial_auto:
-            _zone.update_serial(save_zone_serial=save_zone_serial)
+            if self.type != RecordTypeChoices.SOA and self.zone.soa_serial_auto:
+                self.zone.update_serial(save_zone_serial=save_zone_serial)
 
     def delete(self, *args, save_zone_serial=True, **kwargs):
         if self.rfc2317_cname_record:

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/models/record_template.py

@@ -142,7 +142,7 @@ class RecordTemplate(NetBoxModel):
             raise ValidationError({"value": exc})
 
     def matching_records(self, zone):
-        return zone.record_set.filter(
+        return zone.records.filter(
             name=self.record_name, type=self.type, value=self.value
         )
 

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/models/registration_contact.py

@@ -137,7 +137,7 @@ class RegistrationContact(NetBoxModel):
     @property
     def zones(self):
         return (
-            set(self.zone_set.all())
+            set(self.registrant_zones.all())
             | set(self.admin_c_zones.all())
             | set(self.tech_c_zones.all())
             | set(self.billing_c_zones.all())

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/models/zone.py

@@ -88,6 +88,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("View"),
         to="View",
         on_delete=models.PROTECT,
+        related_name="zones",
         null=False,
     )
     name = models.CharField(
@@ -121,7 +122,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     soa_mname = models.ForeignKey(
         verbose_name=_("SOA MName"),
         to="NameServer",
-        related_name="zones_soa",
+        related_name="soa_zones",
         on_delete=models.PROTECT,
         blank=False,
         null=False,
@@ -190,6 +191,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("Registrar"),
         to="Registrar",
         on_delete=models.SET_NULL,
+        related_name="zones",
         blank=True,
         null=True,
     )
@@ -203,6 +205,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("Registrant"),
         to="RegistrationContact",
         on_delete=models.SET_NULL,
+        related_name="registrant_zones",
         blank=True,
         null=True,
     )
@@ -368,7 +371,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             return None
 
         return (
-            self.view.zone_set.filter(arpa_network__net_contains=self.rfc2317_prefix)
+            self.view.zones.filter(arpa_network__net_contains=self.rfc2317_prefix)
             .order_by("arpa_network__net_mask_length")
             .last()
         )
@@ -389,25 +392,23 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @property
     def child_zones(self):
-        return self.view.zone_set.filter(
-            name__iregex=rf"^[^.]+\.{re.escape(self.name)}$"
-        )
+        return self.view.zones.filter(name__iregex=rf"^[^.]+\.{re.escape(self.name)}$")
 
     @property
     def descendant_zones(self):
-        return self.view.zone_set.filter(name__endswith=f".{self.name}")
+        return self.view.zones.filter(name__endswith=f".{self.name}")
 
     @property
     def parent_zone(self):
         try:
-            return self.view.zone_set.get(name=get_parent_zone_names(self.name)[-1])
+            return self.view.zones.get(name=get_parent_zone_names(self.name)[-1])
         except (Zone.DoesNotExist, IndexError):
             return None
 
     @property
     def ancestor_zones(self):
         return (
-            self.view.zone_set.annotate(name_length=Length("name"))
+            self.view.zones.annotate(name_length=Length("name"))
             .filter(name__in=get_parent_zone_names(self.name))
             .order_by("name_length")
         )
@@ -419,7 +420,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         ]
 
         ns_records = (
-            self.record_set.filter(type=RecordTypeChoices.NS)
+            self.records.filter(type=RecordTypeChoices.NS)
             .exclude(fqdn=self.fqdn)
             .filter(fqdn__in=descendant_zone_names)
         )
@@ -427,8 +428,8 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         return (
             ns_records
-            | self.record_set.filter(type=RecordTypeChoices.DS)
-            | self.record_set.filter(
+            | self.records.filter(type=RecordTypeChoices.DS)
+            | self.records.filter(
                 type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
                 fqdn__in=ns_values,
             )
@@ -473,7 +474,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         )
 
         try:
-            soa_record = self.record_set.get(type=RecordTypeChoices.SOA, name=soa_name)
+            soa_record = self.records.get(type=RecordTypeChoices.SOA, name=soa_name)
 
             if soa_record.ttl != soa_ttl or soa_record.value != soa_rdata.to_text():
                 soa_record.ttl = soa_ttl
@@ -496,9 +497,10 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         nameservers = [f"{nameserver.name}." for nameserver in self.nameservers.all()]
 
-        self.record_set.filter(type=RecordTypeChoices.NS, managed=True).exclude(
-            value__in=nameservers
-        ).delete()
+        for ns_record in self.records.filter(
+            type=RecordTypeChoices.NS, managed=True
+        ).exclude(value__in=nameservers):
+            ns_record.delete()
 
         for ns in nameservers:
             Record.raw_objects.update_or_create(
@@ -533,7 +535,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 continue
 
             relative_name = name.relativize(parent).to_text()
-            address_records = ns_zone.record_set.filter(
+            address_records = ns_zone.records.filter(
                 Q(status__in=RECORD_ACTIVE_STATUS_LIST),
                 Q(Q(name=f"{_nameserver.name}.") | Q(name=relative_name)),
                 Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
@@ -623,9 +625,9 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.rfc2317_parent_zone = rfc2317_parent_zone
                 self.save(update_fields=["rfc2317_parent_zone"])
 
-        ptr_records = self.record_set.filter(
-            type=RecordTypeChoices.PTR
-        ).prefetch_related("zone", "rfc2317_cname_record")
+        ptr_records = self.records.filter(type=RecordTypeChoices.PTR).prefetch_related(
+            "zone", "rfc2317_cname_record"
+        )
         ptr_zones = {ptr_record.zone for ptr_record in ptr_records}
 
         if self.rfc2317_parent_managed:
@@ -752,7 +754,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 or old_view_id != self.view_id
             ):
                 ip_addresses = IPAddress.objects.filter(
-                    netbox_dns_records__in=self.record_set.filter(
+                    netbox_dns_records__in=self.records.filter(
                         ipam_ip_address__isnull=False
                     )
                 )
@@ -795,7 +797,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             else:
                 self.rfc2317_parent_zone = None
 
-            overlapping_zones = self.view.zone_set.filter(
+            overlapping_zones = self.view.zones.filter(
                 rfc2317_prefix__net_overlap=self.rfc2317_prefix,
                 active=True,
             ).exclude(pk=self.pk)
@@ -828,7 +830,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if (
             changed_fields is None or {"name", "view", "status"} & changed_fields
         ) and self.is_reverse_zone:
-            zones = self.view.zone_set.filter(
+            zones = self.view.zones.filter(
                 arpa_network__net_contains_or_equals=self.arpa_network
             )
             address_records = Record.objects.filter(
@@ -858,7 +860,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             or {"name", "view", "status", "rfc2317_prefix", "rfc2317_parent_managed"}
             & changed_fields
         ) and self.is_rfc2317_zone:
-            zones = self.view.zone_set.filter(
+            zones = self.view.zones.filter(
                 arpa_network__net_contains=self.rfc2317_prefix
             )
             address_records = Record.objects.filter(
@@ -882,14 +884,14 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             self.update_rfc2317_parent_zone()
 
         elif changed_fields is not None and {"name", "view", "status"} & changed_fields:
-            for address_record in self.record_set.filter(
+            for address_record in self.records.filter(
                 type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
                 ipam_ip_address__isnull=True,
             ):
                 address_record.save(update_fields=["ptr_record"])
 
         if changed_fields is not None and "name" in changed_fields:
-            for _record in self.record_set.filter(ipam_ip_address__isnull=True):
+            for _record in self.records.filter(ipam_ip_address__isnull=True):
                 _record.save(
                     update_fields=["fqdn"],
                     save_zone_serial=False,
@@ -899,7 +901,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         if changed_fields is None or {"name", "view"} & changed_fields:
             ip_addresses = IPAddress.objects.filter(
-                netbox_dns_records__in=self.record_set.filter(
+                netbox_dns_records__in=self.records.filter(
                     ipam_ip_address__isnull=False
                 )
             )
@@ -913,13 +915,13 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def delete(self, *args, **kwargs):
         with transaction.atomic():
-            address_records = self.record_set.filter(
+            address_records = self.records.filter(
                 ptr_record__isnull=False
             ).prefetch_related("ptr_record")
             for address_record in address_records:
                 address_record.ptr_record.delete()
 
-            ptr_records = self.record_set.filter(address_record__isnull=False)
+            ptr_records = self.records.filter(address_record__isnull=False)
             update_records = list(
                 Record.objects.filter(ptr_record__in=ptr_records).values_list(
                     "pk", flat=True
@@ -945,7 +947,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
             ipam_ip_addresses = list(
                 IPAddress.objects.filter(
-                    netbox_dns_records__in=self.record_set.filter(
+                    netbox_dns_records__in=self.records.filter(
                         ipam_ip_address__isnull=False
                     )
                 )

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/views/nameserver.py

@@ -105,7 +105,7 @@ class NameServerZoneListView(generic.ObjectChildrenView):
 
 @register_model_view(NameServer, "soa_zones")
 class NameServerSOAZoneListView(generic.ObjectChildrenView):
-    queryset = NameServer.objects.prefetch_related("zones_soa")
+    queryset = NameServer.objects.prefetch_related("soa_zones")
     child_model = Zone
     table = ZoneTable
     filterset = ZoneFilterSet
@@ -115,9 +115,9 @@ class NameServerSOAZoneListView(generic.ObjectChildrenView):
     tab = ViewTab(
         label=_("SOA Zones"),
         permission="netbox_dns.view_zone",
-        badge=lambda obj: obj.zones_soa.count(),
+        badge=lambda obj: obj.soa_zones.count(),
         hide_if_empty=True,
     )
 
     def get_children(self, request, parent):
-        return parent.zones_soa
+        return parent.soa_zones

{netbox_plugin_dns-1.1.5 → netbox_plugin_dns-1.1.6}/netbox_dns/views/record.py

@@ -70,7 +70,7 @@ class RecordView(generic.ObjectView):
                 data=cname_targets,
             )
 
-        if instance.zone.view.zone_set.filter(
+        if instance.zone.view.zones.filter(
             name__in=get_parent_zone_names(instance.value_fqdn, min_labels=1),
             active=True,
         ).exists():
@@ -93,7 +93,7 @@ class RecordView(generic.ObjectView):
             )
         )
 
-        parent_zones = instance.zone.view.zone_set.filter(
+        parent_zones = instance.zone.view.zones.filter(
             name__in=get_parent_zone_names(instance.fqdn, include_self=True),
         )