netbox-plugin-dns 0.22.3__py3-none-any.whl → 0.22.5__py3-none-any.whl

netbox_dns/__init__.py

@@ -10,7 +10,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.22.3"
+__version__ = "0.22.5"
 
 
 class DNSConfig(PluginConfig):
@@ -26,9 +26,9 @@ class DNSConfig(PluginConfig):
         "zone_default_ttl": 86400,
         "zone_soa_serial_auto": True,
         "zone_soa_serial": 1,
-        "zone_soa_refresh": 172800,
+        "zone_soa_refresh": 43200,
         "zone_soa_retry": 7200,
-        "zone_soa_expire": 2592000,
+        "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
         "feature_ipam_coupling": False,
         "tolerate_underscores_in_hostnames": False,
@@ -38,7 +38,8 @@ class DNSConfig(PluginConfig):
         ],
         "tolerate_non_rfc1035_types": [],
         "enable_root_zones": False,
-        "enforce_unique_records": False,
+        "enforce_unique_records": True,
+        "enforce_unique_rrset_ttl": True,
     }
     base_url = "netbox-dns"
 

netbox_dns/api/serializers.py

@@ -272,6 +272,7 @@ class RegistrarSerializer(NetBoxModelSerializer):
             "display",
             "name",
             "iana_id",
+            "address",
             "referral_url",
             "whois_server",
             "abuse_email",

netbox_dns/filters/registrar.py

@@ -12,6 +12,7 @@ class RegistrarFilter(NetBoxModelFilterSet):
             "id",
             "name",
             "iana_id",
+            "address",
             "referral_url",
             "whois_server",
             "abuse_email",

netbox_dns/forms/registrar.py

@@ -17,6 +17,7 @@ class RegistrarForm(NetBoxModelForm):
         fields = (
             "name",
             "iana_id",
+            "address",
             "referral_url",
             "whois_server",
             "abuse_email",
@@ -29,12 +30,18 @@ class RegistrarFilterForm(NetBoxModelFilterSetForm):
     model = Registrar
     fieldsets = (
         (None, ("q", "name", "iana_id", "tags")),
-        ("Contact", ("referral_url", "whois_server", "abuse_email", "abuse_phone")),
+        (
+            "Contact",
+            ("address", "referral_url", "whois_server", "abuse_email", "abuse_phone"),
+        ),
     )
 
     name = forms.CharField(
         required=False,
     )
+    address = forms.CharField(
+        required=False,
+    )
     iana_id = forms.IntegerField(
         required=False,
         label="IANA ID",
@@ -64,6 +71,7 @@ class RegistrarImportForm(NetBoxModelImportForm):
         fields = (
             "name",
             "iana_id",
+            "address",
             "referral_url",
             "whois_server",
             "abuse_email",
@@ -96,6 +104,7 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
         (
             None,
             (
+                "address",
                 "referral_url",
                 "whois_server",
                 "abuse_email",
@@ -105,6 +114,7 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     nullable_fields = (
+        "address",
         "referral_url",
         "whois_server",
         "abuse_email",

netbox_dns/forms/zone.py

@@ -15,6 +15,7 @@ from utilities.forms.fields import (
     TagFilterField,
     CSVChoiceField,
     CSVModelChoiceField,
+    CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
@@ -287,6 +288,12 @@ class ZoneImportForm(NetBoxModelImportForm):
         required=False,
         help_text="Zone status",
     )
+    nameservers = CSVModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        to_field_name="name",
+        required=False,
+        help_text="Name servers for the zone",
+    )
     default_ttl = forms.IntegerField(
         required=False,
         help_text="Default TTL",
@@ -308,7 +315,7 @@ class ZoneImportForm(NetBoxModelImportForm):
         required=False,
         help_text="Mailbox of the zone's administrator",
     )
-    soa_serial_auto = forms.BooleanField(
+    soa_serial_auto = forms.NullBooleanField(
         required=False,
         help_text="Generate the SOA serial",
     )
@@ -436,26 +443,6 @@ class ZoneImportForm(NetBoxModelImportForm):
     def clean_soa_rname(self):
         return self._clean_field_with_defaults("soa_rname")
 
-    def clean_soa_serial_auto(self):
-        try:
-            return self._clean_field_with_defaults("soa_serial_auto")
-        except ValidationError:
-            if self.cleaned_data["soa_serial"] or self._get_default_value("soa_serial"):
-                return None
-
-            raise
-
-    def clean_soa_serial(self):
-        try:
-            return self._clean_field_with_defaults("soa_serial")
-        except ValidationError:
-            if self.cleaned_data["soa_serial_auto"] or self._get_default_value(
-                "soa_serial_auto"
-            ):
-                return None
-
-            raise
-
     def clean_soa_refresh(self):
         return self._clean_field_with_defaults("soa_refresh")
 
@@ -468,6 +455,36 @@ class ZoneImportForm(NetBoxModelImportForm):
     def clean_soa_minimum(self):
         return self._clean_field_with_defaults("soa_minimum")
 
+    def clean(self, *args, **kwargs):
+        super().clean(*args, **kwargs)
+
+        soa_serial_auto = self.cleaned_data.get("soa_serial_auto")
+        soa_serial = self.cleaned_data.get("soa_serial")
+
+        if soa_serial is None:
+            soa_serial = self._get_default_value("soa_serial")
+
+        if soa_serial_auto is None:
+            if self._get_default_value("soa_serial_auto") is not None:
+                soa_serial_auto = self._get_default_value("soa_serial_auto")
+
+            elif soa_serial is not None:
+                soa_serial_auto = False
+
+            else:
+                raise ValidationError(
+                    "SOA Serial Auto not set and no default value and SOA Serial available"
+                )
+
+        if "soa_serial_auto" in self.cleaned_data:
+            self.cleaned_data["soa_serial_auto"] = soa_serial_auto
+
+        if "soa_serial" in self.cleaned_data:
+            if soa_serial_auto:
+                self.cleaned_data["soa_serial"] = None
+            else:
+                self.cleaned_data["soa_serial"] = soa_serial
+
     class Meta:
         model = Zone
 
@@ -475,6 +492,7 @@ class ZoneImportForm(NetBoxModelImportForm):
             "view",
             "name",
             "status",
+            "nameservers",
             "default_ttl",
             "description",
             "soa_ttl",

netbox_dns/management/commands/cleanup_database.py

@@ -141,7 +141,7 @@ def record_update_ptr_records(verbose=False):
     for record in Record.objects.filter(
         type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA)
     ):
-        record.update_ptr_record()
+        record.save(update_fields=["ptr_record"])
 
 
 def record_update_ip_address(verbose=False):

netbox_dns/management/commands/cleanup_rrset_ttl.py

@@ -0,0 +1,62 @@
+from django.core.management.base import BaseCommand
+from django.db.models import Max, Min
+
+from netbox_dns.models import (
+    Record,
+    RecordTypeChoices,
+)
+
+
+class Command(BaseCommand):
+    help = "Clean up the TTLs for RRSets"
+
+    def add_arguments(self, parser):
+        min_max = parser.add_mutually_exclusive_group()
+        min_max.add_argument(
+            "--min",
+            action="store_true",
+            help="Use the minimum TTL of an RRSet for all Records",
+        )
+        min_max.add_argument(
+            "--max",
+            action="store_true",
+            help="Use the maximum TTL of an RRSet for all Records",
+        )
+
+    def handle(self, *model_names, **options):
+        self.cleanup_rrset_ttl(**options)
+
+        self.stdout.write("RRSet cleanup completed.")
+
+    def cleanup_rrset_ttl(self, **options):
+        verbose = options.get("verbosity") > 1
+
+        ttl_records = (
+            Record.objects.filter(ttl__isnull=False)
+            .exclude(type=RecordTypeChoices.SOA)
+            .exclude(type=RecordTypeChoices.PTR, maanged=True)
+        )
+        for record in ttl_records:
+            records = Record.objects.filter(
+                name=record.name,
+                zone=record.zone,
+                type=record.type,
+            ).exclude(type=RecordTypeChoices.PTR, maanged=True)
+
+            if records.count() == 1:
+                if options.get("verbosity") > 2:
+                    self.stdout.write(f"Ignoring single record {record.id} ({record})")
+                continue
+
+            if options.get("max"):
+                ttl = records.aggregate(Max("ttl")).get("ttl__max")
+            else:
+                ttl = records.aggregate(Min("ttl")).get("ttl__min")
+
+            for record in records.exclude(ttl=ttl):
+                if options.get("verbosity") > 1:
+                    self.stdout.write(
+                        f"Updating TTL for record {record.id} ({record}) to {ttl}"
+                    )
+                record.ttl = ttl
+                record.save(update_fields=["ttl"], update_rrset_ttl=False)

netbox_dns/models/record.py

@@ -6,7 +6,7 @@ from dns import name as dns_name
 
 from django.core.exceptions import ValidationError
 from django.db import transaction, models
-from django.db.models import Q, ExpressionWrapper, BooleanField
+from django.db.models import Q, ExpressionWrapper, BooleanField, Min
 from django.db.models.functions import Length
 from django.urls import reverse
 
@@ -38,6 +38,10 @@ from netbox_dns.validators import (
 import netbox_dns.models.zone as zone
 
 
+def min_ttl(*ttl_list):
+    return min((ttl for ttl in ttl_list if ttl is not None), default=None)
+
+
 class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
     """Special Manager for records providing the activity status annotation"""
 
@@ -207,7 +211,8 @@ class Record(NetBoxModel):
         try:
             name = (
                 dns_name.from_text(
-                    self.name, origin=dns_name.from_text(self.zone.name, origin=None)
+                    str(self.name),
+                    origin=dns_name.from_text(self.zone.name, origin=None),
                 )
                 .relativize(dns_name.root)
                 .to_unicode()
@@ -309,7 +314,7 @@ class Record(NetBoxModel):
 
         return ptr_zone
 
-    def update_ptr_record(self, update_rfc2317_cname=True):
+    def update_ptr_record(self, update_rfc2317_cname=True, save_zone_serial=True):
         ptr_zone = self.ptr_zone
 
         if (
@@ -339,14 +344,16 @@ class Record(NetBoxModel):
                 not ptr_record.zone.is_rfc2317_zone
                 and ptr_record.rfc2317_cname_record is not None
             ):
-                ptr_record.rfc2317_cname_record.delete()
+                ptr_record.rfc2317_cname_record.delete(
+                    save_zone_serial=save_zone_serial
+                )
 
         with transaction.atomic():
             if ptr_record is not None:
                 if ptr_record.zone.pk != ptr_zone.pk:
                     if ptr_record.rfc2317_cname_record is not None:
                         ptr_record.rfc2317_cname_record.delete()
-                    ptr_record.delete()
+                    ptr_record.delete(save_zone_serial=save_zone_serial)
                     ptr_record = None
 
                 else:
@@ -358,7 +365,7 @@ class Record(NetBoxModel):
                         ptr_record.name = ptr_name
                         ptr_record.value = ptr_value
                         ptr_record.ttl = self.ttl
-                        ptr_record.save()
+                        ptr_record.save(save_zone_serial=save_zone_serial)
 
             if ptr_record is None:
                 ptr_record = Record(
@@ -369,13 +376,14 @@ class Record(NetBoxModel):
                     value=ptr_value,
                     managed=True,
                 )
-                ptr_record.save(update_rfc2317_cname=update_rfc2317_cname)
+                ptr_record.save(
+                    update_rfc2317_cname=update_rfc2317_cname,
+                    save_zone_serial=save_zone_serial,
+                )
 
         self.ptr_record = ptr_record
-        if self.pk:
-            super().save()
 
-    def update_rfc2317_cname_record(self):
+    def update_rfc2317_cname_record(self, save_zone_serial=True):
         if self.zone.rfc2317_parent_managed:
             cname_name = dns_name.from_text(
                 ipaddress.ip_address(self.ip_address).reverse_pointer
@@ -385,7 +393,13 @@ class Record(NetBoxModel):
                 self.rfc2317_cname_record.name = cname_name
                 self.rfc2317_cname_record.zone = self.zone.rfc2317_parent_zone
                 self.rfc2317_cname_record.value = self.fqdn
-                self.rfc2317_cname_record.save()
+                self.rfc2317_cname_record.ttl = min_ttl(
+                    self.rfc2317_cname_record.rfc2317_ptr_records.exclude(pk=self.pk)
+                    .aggregate(Min("ttl"))
+                    .get("ttl__min"),
+                    self.ttl,
+                )
+                self.rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
             else:
                 rfc2317_cname_record = Record.objects.filter(
                     name=cname_name,
@@ -394,20 +408,34 @@ class Record(NetBoxModel):
                     managed=True,
                     value=self.fqdn,
                 ).first()
-                if rfc2317_cname_record is None:
-                    rfc2317_cname_record = Record.objects.create(
+
+                if rfc2317_cname_record is not None:
+                    rfc2317_cname_record.ttl = min_ttl(
+                        rfc2317_cname_record.rfc2317_ptr_records.exclude(pk=self.pk)
+                        .aggregate(Min("ttl"))
+                        .get("ttl__min"),
+                        self.ttl,
+                    )
+                    rfc2317_cname_record.save(
+                        update_fields=["ttl"], save_zone_serial=save_zone_serial
+                    )
+
+                else:
+                    rfc2317_cname_record = Record(
                         name=cname_name,
                         type=RecordTypeChoices.CNAME,
                         zone=self.zone.rfc2317_parent_zone,
                         managed=True,
                         value=self.fqdn,
+                        ttl=self.ttl,
                     )
+                    rfc2317_cname_record.save(save_zone_serial=save_zone_serial)
 
                 self.rfc2317_cname_record = rfc2317_cname_record
 
         else:
             if self.rfc2317_cname_record is not None:
-                self.rfc2317_cname_record.delete()
+                self.rfc2317_cname_record.delete(save_zone_serial=save_zone_serial)
                 self.rfc2317_cname_record = None
 
     def validate_name(self):
@@ -419,7 +447,7 @@ class Record(NetBoxModel):
             zone.to_unicode()
             name.to_unicode()
 
-            self.name = name.to_text()
+            self.name = name.relativize(zone).to_text()
 
         except dns.exception.DNSException as exc:
             raise ValidationError(
@@ -477,7 +505,7 @@ class Record(NetBoxModel):
                 }
             ) from None
 
-    def check_unique(self):
+    def check_unique_record(self):
         if not get_plugin_config("netbox_dns", "enforce_unique_records", False):
             return
 
@@ -491,6 +519,10 @@ class Record(NetBoxModel):
             value=self.value,
             status__in=Record.ACTIVE_STATUS_LIST,
         )
+
+        if self.pk is not None:
+            records = records.exclude(pk=self.pk)
+
         if len(records):
             raise ValidationError(
                 {
@@ -498,6 +530,64 @@ class Record(NetBoxModel):
                 }
             ) from None
 
+    def check_unique_rrset_ttl(self):
+        if self.pk is not None:
+            return
+
+        if not get_plugin_config("netbox_dns", "enforce_unique_rrset_ttl", False):
+            return
+
+        if self.type == RecordTypeChoices.PTR and self.managed:
+            return
+
+        records = (
+            Record.objects.filter(
+                zone=self.zone,
+                name=self.name,
+                type=self.type,
+            )
+            .exclude(ttl=self.ttl)
+            .exclude(type=RecordTypeChoices.PTR, managed=True)
+        )
+
+        if not records.exists():
+            return
+
+        conflicting_ttls = ", ".join(set(str(record.ttl) for record in records))
+        raise ValidationError(
+            {
+                "ttl": f"There is at least one active {self.type} record for name {self.name} in zone {self.zone} and TTL is different ({conflicting_ttls})."
+            }
+        ) from None
+
+    def update_rrset_ttl(self, ttl=None):
+        if self.pk is None:
+            return
+
+        if not get_plugin_config("netbox_dns", "enforce_unique_rrset_ttl", False):
+            return
+
+        if self.type == RecordTypeChoices.PTR and self.managed:
+            return
+
+        if ttl is None:
+            ttl = self.ttl
+
+        records = (
+            Record.objects.filter(
+                zone=self.zone,
+                name=self.name,
+                type=self.type,
+            )
+            .exclude(pk=self.pk)
+            .exclude(ttl=ttl)
+            .exclude(type=RecordTypeChoices.PTR, managed=True)
+        )
+
+        for record in records:
+            record.ttl = ttl
+            record.save(update_fields=["ttl"], update_rrset_ttl=False)
+
     def clean_fields(self, *args, **kwargs):
         self.type = self.type.upper()
         super().clean_fields(*args, **kwargs)
@@ -505,7 +595,9 @@ class Record(NetBoxModel):
     def clean(self, *args, **kwargs):
         self.validate_name()
         self.validate_value()
-        self.check_unique()
+        self.check_unique_record()
+        if self.pk is None:
+            self.check_unique_rrset_ttl()
 
         if not self.is_active:
             return
@@ -580,14 +672,24 @@ class Record(NetBoxModel):
                     }
                 ) from None
 
-    def save(self, *args, update_rfc2317_cname=True, **kwargs):
+    def save(
+        self,
+        *args,
+        update_rfc2317_cname=True,
+        save_zone_serial=True,
+        update_rrset_ttl=True,
+        **kwargs,
+    ):
         self.full_clean()
 
+        if self.pk is not None and update_rrset_ttl:
+            self.update_rrset_ttl()
+
         if self.is_ptr_record:
             if self.zone.is_rfc2317_zone:
                 self.ip_address = self.address_from_rfc2317_name
                 if update_rfc2317_cname:
-                    self.update_rfc2317_cname_record()
+                    self.update_rfc2317_cname_record(save_zone_serial=save_zone_serial)
             else:
                 self.ip_address = self.address_from_name
 
@@ -597,7 +699,10 @@ class Record(NetBoxModel):
             self.ip_address = None
 
         if self.is_address_record:
-            self.update_ptr_record()
+            self.update_ptr_record(
+                update_rfc2317_cname=update_rfc2317_cname,
+                save_zone_serial=save_zone_serial,
+            )
         elif self.ptr_record is not None:
             self.ptr_record.delete()
             self.ptr_record = None
@@ -606,15 +711,24 @@ class Record(NetBoxModel):
 
         zone = self.zone
         if self.type != RecordTypeChoices.SOA and zone.soa_serial_auto:
-            zone.update_serial()
+            zone.update_serial(save_zone_serial=save_zone_serial)
 
-    def delete(self, *args, **kwargs):
+    def delete(self, *args, save_zone_serial=True, **kwargs):
         if self.rfc2317_cname_record:
-            if (
-                self.rfc2317_cname_record.pk
-                and self.rfc2317_cname_record.rfc2317_ptr_records.count() == 1
-            ):
-                self.rfc2317_cname_record.delete()
+            if self.rfc2317_cname_record.pk:
+                if self.rfc2317_cname_record.rfc2317_ptr_records.count() == 1:
+                    self.rfc2317_cname_record.delete()
+                else:
+                    self.rfc2317_cname_record.ttl = (
+                        self.rfc2317_cname_record.rfc2317_ptr_records.exclude(
+                            pk=self.pk
+                        )
+                        .aggregate(Min("ttl"))
+                        .get("ttl__min")
+                    )
+                    self.rfc2317_cname_record.save(
+                        update_fields=["ttl"], save_zone_serial=save_zone_serial
+                    )
 
         if self.ptr_record:
             self.ptr_record.delete()
@@ -623,7 +737,7 @@ class Record(NetBoxModel):
 
         zone = self.zone
         if zone.soa_serial_auto:
-            zone.update_serial()
+            zone.update_serial(save_zone_serial=save_zone_serial)
 
 
 @register_search

netbox_dns/models/zone.py

@@ -249,6 +249,8 @@ class Zone(NetBoxModel):
         null=True,
     )
 
+    soa_serial_dirty = False
+
     objects = ZoneManager()
 
     clone_fields = [
@@ -470,11 +472,24 @@ class Zone(NetBoxModel):
 
         return soa_serial
 
-    def update_serial(self):
+    def update_serial(self, save_zone_serial=True):
+        if not self.soa_serial_auto:
+            return
+
         self.last_updated = datetime.now()
         self.soa_serial = ceil(datetime.now().timestamp())
-        self.update_soa_record()
-        super().save()
+
+        if save_zone_serial:
+            super().save(update_fields=["soa_serial", "last_updated"])
+            self.soa_serial_dirty = False
+            self.update_soa_record()
+        else:
+            self.soa_serial_dirty = True
+
+    def save_soa_serial(self):
+        if self.soa_serial_auto and self.soa_serial_dirty:
+            super().save(update_fields=["soa_serial", "last_updated"])
+            self.soa_serial_dirty = False
 
     @property
     def network_from_name(self):
@@ -503,28 +518,45 @@ class Zone(NetBoxModel):
             if rfc2317_parent_zone is None:
                 self.rfc2317_parent_managed = False
                 self.rfc2317_parent_zone = None
-                self.save()
+                self.save(
+                    update_fields=["rfc2317_parent_zone", "rfc2317_parent_managed"]
+                )
 
             elif self.rfc2317_parent_zone != rfc2317_parent_zone:
                 self.rfc2317_parent_zone = rfc2317_parent_zone
-                self.save()
+                self.save(update_fields=["rfc2317_parent_zone"])
 
-        ptr_records = self.record_set.filter(type=record.RecordTypeChoices.PTR)
+        ptr_records = self.record_set.filter(
+            type=record.RecordTypeChoices.PTR
+        ).prefetch_related("zone", "rfc2317_cname_record")
+        ptr_zones = {ptr_record.zone for ptr_record in ptr_records}
 
         if self.rfc2317_parent_managed:
             for ptr_record in ptr_records:
-                ptr_record.save()
+                ptr_record.save(save_zone_serial=False)
 
+            self.rfc2317_parent_zone.save_soa_serial()
+            self.rfc2317_parent_zone.update_soa_record()
         else:
             cname_records = {
                 ptr_record.rfc2317_cname_record
                 for ptr_record in ptr_records
                 if ptr_record.rfc2317_cname_record is not None
             }
+            cname_zones = {cname_record.zone for cname_record in cname_records}
+
             for ptr_record in ptr_records:
-                ptr_record.save(update_rfc2317_cname=False)
+                ptr_record.save(update_rfc2317_cname=False, save_zone_serial=False)
             for cname_record in cname_records:
-                cname_record.delete()
+                cname_record.delete(save_zone_serial=False)
+
+            for cname_zone in cname_zones:
+                cname_zone.save_soa_serial()
+                cname_zone.update_soa_record()
+
+        for ptr_zone in ptr_zones:
+            ptr_zone.save_soa_serial()
+            ptr_zone.update_soa_record()
 
     def clean(self, *args, **kwargs):
         self.check_name_conflict()
@@ -643,7 +675,12 @@ class Zone(NetBoxModel):
             )
 
             for address_record in address_records:
-                address_record.update_ptr_record()
+                address_record.save(
+                    update_fields=["ptr_record"], save_zone_serial=False
+                )
+
+            for zone in zones:
+                zone.save_soa_serial()
 
             if self.arpa_network.version == 4:
                 rfc2317_child_zones = Zone.objects.filter(
@@ -673,7 +710,14 @@ class Zone(NetBoxModel):
             )
 
             for address_record in address_records:
-                address_record.update_ptr_record(update_rfc2317_cname=False)
+                address_record.save(
+                    update_fields=["ptr_record"],
+                    update_rfc2317_cname=False,
+                    save_zone_serial=False,
+                )
+
+            for zone in zones:
+                zone.save_soa_serial()
 
             self.update_rfc2317_parent_zone()
 
@@ -681,7 +725,7 @@ class Zone(NetBoxModel):
             for address_record in self.record_set.filter(
                 type__in=(record.RecordTypeChoices.A, record.RecordTypeChoices.AAAA)
             ):
-                address_record.update_ptr_record()
+                address_record.save(update_fields=["ptr_record"])
 
             # Fix name in IP Address when zone name is changed
             if (
@@ -694,11 +738,14 @@ class Zone(NetBoxModel):
                     ip.dns_name = f'{ip.custom_field_data["ipaddress_dns_record_name"]}.{self.name}'
                     ip.save(update_fields=["dns_name"])
 
+        self.save_soa_serial()
         self.update_soa_record()
 
     def delete(self, *args, **kwargs):
         with transaction.atomic():
-            address_records = self.record_set.filter(ptr_record__isnull=False)
+            address_records = self.record_set.filter(
+                ptr_record__isnull=False
+            ).prefetch_related("ptr_record")
             for address_record in address_records:
                 address_record.ptr_record.delete()
 
@@ -715,8 +762,13 @@ class Zone(NetBoxModel):
                 for ptr_record in ptr_records
                 if ptr_record.rfc2317_cname_record is not None
             }
+            cname_zones = {cname_record.zone for cname_record in cname_records}
+
             for cname_record in cname_records:
-                cname_record.delete()
+                cname_record.delete(save_zone_serial=False)
+            for cname_zone in cname_zones:
+                cname_zone.save_soa_serial()
+                cname_zone.update_soa_record()
 
             rfc2317_child_zones = [
                 child_zone.pk for child_zone in self.rfc2317_child_zones.all()
@@ -733,11 +785,25 @@ class Zone(NetBoxModel):
 
             super().delete(*args, **kwargs)
 
-        for address_record in record.Record.objects.filter(pk__in=update_records):
-            address_record.update_ptr_record()
-
-        for child_zone in Zone.objects.filter(pk__in=rfc2317_child_zones):
-            child_zone.update_rfc2317_parent_zone()
+        address_records = record.Record.objects.filter(
+            pk__in=update_records
+        ).prefetch_related("zone")
+
+        for address_record in address_records:
+            address_record.save(save_zone_serial=False)
+        for address_zone in {address_record.zone for address_record in address_records}:
+            address_zone.save_soa_serial()
+            address_zone.update_soa_record()
+
+        rfc2317_child_zones = Zone.objects.filter(pk__in=rfc2317_child_zones)
+        if rfc2317_child_zones:
+            for child_zone in rfc2317_child_zones:
+                child_zone.update_rfc2317_parent_zone()
+
+            new_rfc2317_parent_zone = rfc2317_child_zones.first().rfc2317_parent_zone
+            if new_rfc2317_parent_zone is not None:
+                new_rfc2317_parent_zone.save_soa_serial()
+                new_rfc2317_parent_zone.update_soa_record()
 
 
 @receiver(m2m_changed, sender=Zone.nameservers.through)

netbox_dns/signals/ipam_coupling.py

@@ -121,15 +121,27 @@ def ip_address_update_dns_information(instance, **kwargs):
 
     name, ttl, disable_ptr, zone_id = ipaddress_cf_data(instance)
 
+    previous_zone_id = None
+    if instance.pk is not None:
+        try:
+            old_instance = IPAddress.objects.get(pk=instance.pk)
+            previous_zone_id = old_instance.custom_field_data.get(
+                "ipaddress_dns_zone_id"
+            )
+        except IPAddress.DoesNotExist:
+            pass
+
     if zone_id is not None:
         instance.dns_name = f"{name}.{Zone.objects.get(pk=zone_id).name}"
     else:
-        instance.dns_name = ""
         instance.custom_field_data["ipaddress_dns_record_name"] = None
         instance.custom_field_data["ipaddress_dns_record_ttl"] = None
         instance.custom_field_data["ipaddress_dns_record_disable_ptr"] = False
         instance.custom_field_data["ipaddress_dns_zone_id"] = None
 
+        if previous_zone_id is not None:
+            instance.dns_name = ""
+
 
 #
 # Handle DNS record operation after IPAddress has been created or modified

netbox_dns/templates/netbox_dns/registrar.html

@@ -22,6 +22,10 @@
                 <h5 class="card-header">Contact Details</h5>
                 <div class="card-body">
                     <table class="table table-hover attr-table">
+                        <tr>
+                            <th scope="row">Address</th>
+                            <td>{{ object.address }}</td>
+                        </tr>
                         <tr>
                             <th scope="row">Referral URL</th>
                             <td><a href="{{ object.referral_url }}">{{ object.referral_url }}</a></td>

netbox_dns/templates/netbox_dns/zone.html

@@ -120,10 +120,17 @@
                         <th scope="row">Responsible</th>
                         <td>{{ object.soa_rname }}</td>
                     </tr>
+                    {% if object.soa_serial_auto %}
+                    <tr>
+                        <th scope="row">Serial (auto-generated)</th>
+                        <td>{{ object.soa_serial }}</td>
+                    </tr>
+                    {% else %}
                     <tr>
                         <th scope="row">Serial</th>
                         <td>{{ object.soa_serial }}</td>
                     </tr>
+                    {% endif %}
                     <tr>
                         <th scope="row">Refresh</th>
                         <td>{{ object.soa_refresh }}</td>

{netbox_plugin_dns-0.22.3.dist-info → netbox_plugin_dns-0.22.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.22.3
+Version: 0.22.5
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -8,6 +8,7 @@ Keywords: netbox,netbox-plugin,dns
 Author: Peter Eckel
 Author-email: pete@netbox-dns.org
 Requires-Python: >=3.8,<4.0
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
@@ -19,28 +20,30 @@ Requires-Dist: dnspython (>=2.2.1,<3.0.0)
 Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
 Description-Content-Type: text/markdown
 
-<h1 align="center">NetBox DNS</h1>
-
-<p align="center"><i>NetBox DNS is a NetBox plugin for managing DNS views, zones, name servers and records.</i></p>
+# NetBox DNS
+The NetBox DNS plugin enables NetBox to manage operational DNS data such as name servers, zones, records and views, as well as registration data for domains. It can automate tasks like creating PTR records, generating zone serial numbers, NS and SOA records, as well as validate names and values values for resource records to ensure zone data is consistent, current and conforming to the relevant RFCs.
 
 <div align="center">
 <a href="https://pypi.org/project/netbox-plugin-dns/"><img src="https://img.shields.io/pypi/v/netbox-plugin-dns" alt="PyPi"/></a>
-<a href="https://github.com/peteeckel/netbox-plugin-dns/stargazers"><img src="https://img.shields.io/github/stars/peteeckel/netbox-plugin-dns" alt="Stars Badge"/></a>
-<a href="https://github.com/peteeckel/netbox-plugin-dns/network/members"><img src="https://img.shields.io/github/forks/peteeckel/netbox-plugin-dns" alt="Forks Badge"/></a>
-<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/stargazers"><img src="https://img.shields.io/github/stars/peteeckel/netbox-plugin-dns?style=flat" alt="Stars Badge"/></a>
+<a href="https://github.com/peteeckel/netbox-plugin-dns/network/members"><img src="https://img.shields.io/github/forks/peteeckel/netbox-plugin-dns?style=flat" alt="Forks Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/issues"><img src="https://img.shields.io/github/issues/peteeckel/netbox-plugin-dns" alt="Issues Badge"/></a>
+<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://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>
 </div>
 
 ## Features
 
 * Manage name servers, zones and records
 * Automatically generate SOA and NS records for zones
-* Automatically create and update PTR records for IPv4 and IPv6 records
-* Optionally organize DNS zones in views for split horizon DNS and multi-site deployments
-* Optionally maintain domain registrar and registrant information for zones
-* Maintain RFC2317 reverse zones for IPv4 prefixes with a network mask length longer than 24 bits
+* Automatically create and update PTR records for IPv4 and IPv6 address records
+* Organize DNS zones in views for split horizon DNS and multi-site deployments
+* Manage domain registrar and registrant information for domains related to zones
+* Manage RFC2317 reverse zones for IPv4 prefixes with a network mask length longer than 24 bits
 
 NetBox DNS is using the standardized NetBox plugin interface, so it also takes advantage of the NetBox tagging and change log features.
 

{netbox_plugin_dns-0.22.3.dist-info → netbox_plugin_dns-0.22.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-netbox_dns/__init__.py,sha256=Bsztyx4i5bssOgcR0Lt8a-HmYJhF9N6GKbpoFDyNKTY,2778
+netbox_dns/__init__.py,sha256=Wnz89UxRISvgUOkm-cZI50tMo6taJh14iZnSb1Wx0L4,2818
 netbox_dns/api/nested_serializers.py,sha256=XB7bcCjVMPYrumJWgRicj06PukQ2UCBjdr84AIUJuVQ,3291
-netbox_dns/api/serializers.py,sha256=03BYJMUjIK3edvJv1kcU8jt440kIm-YH6ZAw2T374HM,8160
+netbox_dns/api/serializers.py,sha256=H5Vm1O6C4SsxHVzdooYiu5ak3ykxXo-L1mT6ISWVRV8,8183
 netbox_dns/api/urls.py,sha256=R9VmmWtdrjvr35i5d_SfZK2lGn6JzmPuWEKTQlZ8MJo,575
 netbox_dns/api/views.py,sha256=DjovvTfS4F2Fq2Ahea6f4LBJiWr01ajk-wSZHNTya5I,3527
 netbox_dns/apps.py,sha256=JCW5eS-AQBUubDJve1DjP-IRFKTFGQh1NLGWzJpC5MI,151
@@ -12,16 +12,16 @@ netbox_dns/filters/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrF
 netbox_dns/filters/contact.py,sha256=_onZ6G2KKgfvm9Emg_kng2RPETRMfbTyIR8Tvs9d2YM,1027
 netbox_dns/filters/nameserver.py,sha256=sDKsrluSmUZ0aTw_wagYJAh1g5fKzyzHXbJu6DaK1b8,522
 netbox_dns/filters/record.py,sha256=DH1x4bNkBAN_gVNklAjorcgHoJmH_AXEf1sBNvJS6Kc,1691
-netbox_dns/filters/registrar.py,sha256=kAvE2qNah0t5KtW-QniSw1HyhUgNnlvNSyVpHdUbSng,888
+netbox_dns/filters/registrar.py,sha256=8UXJXUb0XmkPyPQ2oACAhzhmZtAmvM2c4hTWMDLuBEo,911
 netbox_dns/filters/view.py,sha256=Sji4DKy0VKk8BLEdk8xCe8su3rUBtXeJUsUAee0IsOs,497
 netbox_dns/filters/zone.py,sha256=gNKTLll0nvdkzjEVl5c4O1hncU13IFVKn61iXThLYJA,3556
 netbox_dns/forms/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/forms/contact.py,sha256=Z8llYOpcGns8ZerOLsldpY836pfjO7427rmAZ4T8Kyg,4492
 netbox_dns/forms/nameserver.py,sha256=LUYV_tna667flgPdQevDFniMdXZUYRUG8iqCx7HKdxQ,2027
 netbox_dns/forms/record.py,sha256=TAQ-rZ55lmWE_piogiE5TwTv1v4r5T2yZpNT8K7GrPU,6171
-netbox_dns/forms/registrar.py,sha256=9yGh1BSUbgdSGxM1QTOUeff8ExThX6QnDh_GpVTHjX4,2437
+netbox_dns/forms/registrar.py,sha256=Vkw8cafXQRDHf7K7OFPn62R-_BzjNOofnhLmL2Hw7mg,2636
 netbox_dns/forms/view.py,sha256=KEWlUo8-oXP_QsqT5fW_UK-ZoX9g-f4CqRnJ_P6LHco,1627
-netbox_dns/forms/zone.py,sha256=RoRJ1g1zOuC6v_6NrSZe2ILQB8InxdoQCjJYSam1k5U,20984
+netbox_dns/forms/zone.py,sha256=Y9KfeSCzFrJU1LxQjxPcLANu3NEcaHjvxnyMqgna_FY,21702
 netbox_dns/graphql/__init__.py,sha256=v3lLvVoP-JQbEZ1NY49u1TNqvanF-4TqOtjHXrbsTvU,811
 netbox_dns/graphql/contact.py,sha256=2iyuvCxG09CLDUMhan5vR3uFZxCVzKNZBrotr_zoUVY,497
 netbox_dns/graphql/nameserver.py,sha256=mlQw1Po_Ax_fjyyXVBetyxlFLrCqmptYDgOspZvYtP4,527
@@ -30,7 +30,8 @@ netbox_dns/graphql/registrar.py,sha256=TEQSNT8CeIqquzySMRluGk3I2t9rYgQCgDbLJ0gnL
 netbox_dns/graphql/schema.py,sha256=D_dDusogaI55tmGx_dr1owsgzXS5fd2S-kPZ7xcXxs8,221
 netbox_dns/graphql/view.py,sha256=S_61hYlQCtPQen1lI1UQs38UBWKQTaWfUxzlbpO07zA,467
 netbox_dns/graphql/zone.py,sha256=QDBxocezhLSHBGDV4RJnmarBfOsiUTeE9KzBGJ3gJi8,467
-netbox_dns/management/commands/cleanup_database.py,sha256=fGkzOPXDsZWTlwetnerzkMmdpluV4vo34XXB_z8-yHU,6035
+netbox_dns/management/commands/cleanup_database.py,sha256=eggyMZrRg--cXDQJ-boofHboG1gJTs8j-oldhn6EuCo,6050
+netbox_dns/management/commands/cleanup_rrset_ttl.py,sha256=gCvwH6hGw32YJtcy_pEWIP29PSRMW23-qzB8SHEdixQ,2077
 netbox_dns/management/commands/setup_coupling.py,sha256=Yn1nffPR7fBgB6WWBdDqdnp3k8z1QK8k6qi9xbx4U6Y,4580
 netbox_dns/management/commands/update_soa.py,sha256=qvlApMngTVpauj0CU0yeOy9r3lxxDciKorMxFsyvQhs,661
 netbox_dns/migrations/0001_initial.py,sha256=R9FbIQ7nO1ROb12NL8YQDkFQuP1r6-TtMcPwg4rwjus,4153
@@ -66,13 +67,13 @@ netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 netbox_dns/models/__init__.py,sha256=Q7UIEe2vGh18AZN4er6CykciwXPQGgUq0L-9718wZqU,182
 netbox_dns/models/contact.py,sha256=Mzj4SR3fczOE96etWjObJElk0RVQetNuXZVtm8sS1h8,2849
 netbox_dns/models/nameserver.py,sha256=SjKUbMRNE3TSDzmxbKFR9b4AfYPS0UPj0QeO7XpwNRk,2941
-netbox_dns/models/record.py,sha256=2eI8UyzRUrDjO61m0rCsAFDr8SjxPsbQnyyN2dEWRSE,19597
+netbox_dns/models/record.py,sha256=nOKjaoVuyMVIfwNw_V4hYYd71fcE4UyXThU983KrXaY,23629
 netbox_dns/models/registrar.py,sha256=ByKHeqH5KfswqOLjya8DZExJ1omSKFHMfCjIIYfnwTo,1416
 netbox_dns/models/view.py,sha256=ljs3Q2xQR63ZOSyja5H7DEdFbm7MX2ZjlR6uNVrAsVo,920
-netbox_dns/models/zone.py,sha256=F-SMgAScdDlEEk4cp826xfktSGv9OjV8QxqrAnAP0NE,23743
+netbox_dns/models/zone.py,sha256=Ek7Jui3AldNHVAHowbQhC47QoXv0IgkhLzFziN14UUI,26333
 netbox_dns/navigation.py,sha256=IutEr_TcPgDGzqTT1ZzV4IUABLSOFU9v364BfpCqbro,4587
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-netbox_dns/signals/ipam_coupling.py,sha256=yQnJO5eHZGAhJxC1W5LfoQluVUcac9_oZ9XFFonuz2w,5365
+netbox_dns/signals/ipam_coupling.py,sha256=xbb37_77ZqtgT3mKXZp18QRduqZuiAuYGPk8R9d7SVc,5727
 netbox_dns/tables/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/tables/contact.py,sha256=HpblHKrlQqQAPC59gvw8wUV3tc6UBAphHPE6CfN2uVM,747
 netbox_dns/tables/nameserver.py,sha256=7Ap0px5gAHtgk5XFMpZCHccy9N-v8UKy19GP7fdWuPc,819
@@ -86,7 +87,7 @@ netbox_dns/templates/netbox_dns/nameserver.html,sha256=3AJVbsuhKg4Jy74rlvwrGSHd_
 netbox_dns/templates/netbox_dns/record/managed.html,sha256=G6LPG1koUGuzUiwYdv1okdVa4sKaofiQegDBnsFL0kA,89
 netbox_dns/templates/netbox_dns/record/related.html,sha256=Aqor8uGcuHQTHjlX-Xmni2Yp4N7lOBrMOqQiszrQOC0,742
 netbox_dns/templates/netbox_dns/record.html,sha256=1XOp9Rf7KiV736RKGh7A8LAYkrfI7veG5SsEhaeMghw,6613
-netbox_dns/templates/netbox_dns/registrar.html,sha256=Ijy8w0P3UPiyVFkIjk92d4n3GCqsm-0kQjk-QJ-2BCw,1956
+netbox_dns/templates/netbox_dns/registrar.html,sha256=rSShbH68nP0r8EUHn0-TZOsUj6pg7hmfvM7h2tqouUA,2130
 netbox_dns/templates/netbox_dns/related_dns_objects.html,sha256=KSzlnw1cStrJa3poKkwrt_ycIH0oH0STWIHRNy3ks4g,806
 netbox_dns/templates/netbox_dns/view.html,sha256=_lDjd2xY3upfGpNpemXXMzgsaKZlX3-PzPPAdYkIjvs,1350
 netbox_dns/templates/netbox_dns/zone/base.html,sha256=pucf_b7iGg4hCXqwIbR0_WtEQdeH2LQtTCRTSoeBhFc,460
@@ -95,7 +96,7 @@ netbox_dns/templates/netbox_dns/zone/managed_record.html,sha256=5P85eJuQOB7omih2
 netbox_dns/templates/netbox_dns/zone/record.html,sha256=1oIRGXOZAjwmTMkTgArfKyVrmL54Sh_IN7IAF3qYEKM,2218
 netbox_dns/templates/netbox_dns/zone/registration.html,sha256=3R5uqLXZxIJkp9_LVnTTgTV61mITfDPDDNofV7s4d1k,1283
 netbox_dns/templates/netbox_dns/zone/rfc2317_child_zone.html,sha256=kxIrhn0gghb4l1eZhpsICdfkSYegqSXR9zFIWiZLypA,527
-netbox_dns/templates/netbox_dns/zone.html,sha256=mB-oyl7vGgtr-DksgoiU7WSx-88_oD52s4YQBrOIajc,6895
+netbox_dns/templates/netbox_dns/zone.html,sha256=_lQhr00_V8ThadlTuTm5zPkcvyjYQxxYGHQsfTOgDCs,7187
 netbox_dns/urls.py,sha256=NxqvnRxLM6VwUBTY6KA8u-PRjNklmBai7gy6NXc-1xo,9172
 netbox_dns/utilities/__init__.py,sha256=8DqDx-99kejykwaIt_29W5KgY8RvWBOk6526vrf22UQ,1967
 netbox_dns/utilities/ipam_coupling.py,sha256=LhdFafF4OAOU8rgROOqY5Dt7XDT_SUZP2JuIqCQYVqw,3573
@@ -109,7 +110,7 @@ netbox_dns/views/record.py,sha256=2xzZnCWmCZIyEVjQfYo0rByhBNItPxNFiehOwDl8U6w,25
 netbox_dns/views/registrar.py,sha256=aznSKt1L5tILMLGgcZiBR7u7B8rNl-jM1B2-N0fTeK8,2072
 netbox_dns/views/view.py,sha256=uUvtlNEh5MYoEALvWWaCOqj_Zj8dpGOL2PUyg-UPfEA,1895
 netbox_dns/views/zone.py,sha256=SyttTAgrPPzf1jIT1B4RexCLdXYjSmPIZsefO_zog1Q,4587
-netbox_plugin_dns-0.22.3.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-0.22.3.dist-info/METADATA,sha256=oY3JFLGQ3NGo0b4u2RHWojzl1hdphQL9jyTfabgqnrY,3801
-netbox_plugin_dns-0.22.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-netbox_plugin_dns-0.22.3.dist-info/RECORD,,
+netbox_plugin_dns-0.22.5.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
+netbox_plugin_dns-0.22.5.dist-info/METADATA,sha256=U6WLJ-pstL29t54fKW1LAJMkq8r-rtSR8AtutZqxnHg,4572
+netbox_plugin_dns-0.22.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+netbox_plugin_dns-0.22.5.dist-info/RECORD,,

{netbox_plugin_dns-0.22.3.dist-info → netbox_plugin_dns-0.22.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any