netbox-plugin-dns 1.2.2__tar.gz → 1.2.4__tar.gz

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.2
+Version: 1.2.4
 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
@@ -69,7 +69,7 @@ For integration with a large number of DNS server implementations integration to
 * NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
-## Compatibility with earlier NetBox Versions
+## Compatibility with NetBox Versions
 
 NetBox Version | NetBox DNS Version | Comment
 -------------- | ------------------ | -------
@@ -78,6 +78,7 @@ NetBox Version | NetBox DNS Version | Comment
 3.7            | 0.22               |
 4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
 4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+4.2            | 1.2                |
 
 ## Installation & Configuration
 
@@ -98,7 +99,7 @@ PLUGINS = [
 ]
 ```
 
-To permanently keep the plugin installed when updating NetBox via `update.sh`:
+To permanently keep the plugin installed when updating NetBox via `upgrade.sh`:
 
 ```
 echo netbox-plugin-dns >> ~/netbox/local_requirements.txt

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/README.md

@@ -53,7 +53,7 @@ For integration with a large number of DNS server implementations integration to
 * NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
-## Compatibility with earlier NetBox Versions
+## Compatibility with NetBox Versions
 
 NetBox Version | NetBox DNS Version | Comment
 -------------- | ------------------ | -------
@@ -62,6 +62,7 @@ NetBox Version | NetBox DNS Version | Comment
 3.7            | 0.22               |
 4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
 4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+4.2            | 1.2                |
 
 ## Installation & Configuration
 
@@ -82,7 +83,7 @@ PLUGINS = [
 ]
 ```
 
-To permanently keep the plugin installed when updating NetBox via `update.sh`:
+To permanently keep the plugin installed when updating NetBox via `upgrade.sh`:
 
 ```
 echo netbox-plugin-dns >> ~/netbox/local_requirements.txt

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/__init__.py

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

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/api/serializers_/zone.py

@@ -44,6 +44,12 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Primary nameserver for the zone"),
     )
+    soa_rname = serializers.CharField(
+        max_length=255,
+        read_only=False,
+        required=False,
+        help_text=_("Contact email for the zone"),
+    )
     rfc2317_parent_zone = NestedZoneSerializer(
         many=False,
         read_only=True,
@@ -105,6 +111,12 @@ class ZoneSerializer(NetBoxModelSerializer):
     )
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
+    def validate(self, data):
+        if (template := data.get("template")) is not None:
+            template.apply_to_zone_data(data)
+
+        return super().validate(data)
+
     def create(self, validated_data):
         template = validated_data.pop("template", None)
         nameservers = validated_data.pop("nameservers", None)
@@ -115,7 +127,7 @@ class ZoneSerializer(NetBoxModelSerializer):
             zone.nameservers.set(nameservers)
 
         if template is not None:
-            template.apply_to_zone(zone)
+            template.apply_to_zone_relations(zone)
 
         return zone
 
@@ -129,7 +141,7 @@ class ZoneSerializer(NetBoxModelSerializer):
             zone.nameservers.set(nameservers)
 
         if template is not None:
-            template.apply_to_zone(zone)
+            template.apply_to_zone_relations(zone)
 
         return zone
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/api/serializers_/zone_template.py

@@ -26,6 +26,13 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Nameservers for the zone"),
     )
+    soa_mname = NameServerSerializer(
+        nested=True,
+        many=False,
+        read_only=False,
+        required=False,
+        help_text=_("Primary nameserver for the zone"),
+    )
     record_templates = NestedRecordTemplateSerializer(
         many=True,
         read_only=False,
@@ -108,6 +115,8 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
             "name",
             "display",
             "nameservers",
+            "soa_mname",
+            "soa_rname",
             "description",
             "tags",
             "created",

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/filtersets/zone_template.py

@@ -43,6 +43,18 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("Nameserver"),
     )
+    soa_mname_id = django_filters.ModelMultipleChoiceFilter(
+        queryset=NameServer.objects.all(),
+        field_name="soa_mname",
+        to_field_name="id",
+        label=_("SOA MNAME ID"),
+    )
+    soa_mname = django_filters.ModelMultipleChoiceFilter(
+        queryset=NameServer.objects.all(),
+        field_name="soa_mname__name",
+        to_field_name="name",
+        label=_("SOA MNAME"),
+    )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
         label=_("Registrar ID"),
@@ -100,6 +112,7 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "id",
             "name",
             "description",
+            "soa_rname",
         )
 
     def search(self, queryset, name, value):
@@ -107,6 +120,7 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             return queryset
         qs_filter = (
             Q(name__icontains=value)
+            | Q(soa_rname__icontains=value)
             | Q(registrar__name__icontains=value)
             | Q(registry_domain_id__icontains=value)
             | Q(registrant__name__icontains=value)

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/forms/zone.py

@@ -35,7 +35,7 @@ from netbox_dns.models import (
     ZoneTemplate,
 )
 from netbox_dns.choices import ZoneStatusChoices
-from netbox_dns.utilities import name_to_unicode
+from netbox_dns.utilities import name_to_unicode, network_to_reverse
 from netbox_dns.fields import RFC2317NetworkFormField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
@@ -66,13 +66,20 @@ class ZoneTemplateUpdateMixin:
             self.cleaned_data["tags"] = template.tags.all()
 
         for field in template.template_fields:
-            if (
-                self.cleaned_data.get(field) is None
-                and getattr(template, field) is not None
-            ):
+            if self.cleaned_data.get(field) in (None, "") and getattr(
+                template, field
+            ) not in (None, ""):
                 self.cleaned_data[field] = getattr(template, field)
 
-        template_error = None
+        if self.cleaned_data.get("soa_mname") is None:
+            self.add_error(
+                "soa_mname",
+                _("soa_mname not set and no template or default value defined"),
+            )
+
+        if self.errors:
+            return
+
         saved_events_queue = events_queue.get()
 
         try:
@@ -106,13 +113,20 @@ class ZoneTemplateUpdateMixin:
                 raise RollbackTransaction
 
         except ValidationError as exc:
-            self.add_error("template", exc.messages)
+            if hasattr(exc, "error_dict"):
+                for field_name in self.fields.keys():
+                    exc.error_dict.pop(field_name, None)
+                errors = exc.error_dict.values()
+            else:
+                errors = exc.messages
+
+            for error in errors:
+                self.add_error("template", error)
+
         except RollbackTransaction:
             pass
 
         events_queue.set(saved_events_queue)
-        if template_error is not None:
-            raise ValidationError({"template": template_error})
 
         return self.cleaned_data
 
@@ -161,8 +175,14 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         validators=[MinValueValidator(1)],
         label=_("SOA TTL"),
     )
+    soa_mname = DynamicModelChoiceField(
+        queryset=NameServer.objects.all(),
+        help_text=_("Primary nameserver this zone"),
+        required=False,
+        label=_("SOA MName"),
+    )
     soa_rname = forms.CharField(
-        required=True,
+        required=False,
         help_text=_("Mailbox of the zone's administrator"),
         label=_("SOA RName"),
     )
@@ -307,6 +327,13 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             else self.initial["default_ttl"]
         )
 
+    def clean_name(self):
+        name = self.cleaned_data["name"]
+        if reverse_name := network_to_reverse(name):
+            return reverse_name
+        else:
+            return name
+
     class Meta:
         model = Zone
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/forms/zone_template.py

@@ -40,6 +40,11 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
         queryset=NameServer.objects.all(),
         required=False,
     )
+    soa_mname = DynamicModelChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("MName"),
+    )
     record_templates = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
@@ -47,6 +52,7 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
 
     fieldsets = (
         FieldSet("name", "description", "nameservers", name=_("Zone Template")),
+        FieldSet("soa_mname", "soa_rname", name=_("SOA")),
         FieldSet("record_templates", name=_("Record Templates")),
         FieldSet(
             "registrar",
@@ -66,6 +72,8 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
         fields = (
             "name",
             "nameservers",
+            "soa_mname",
+            "soa_rname",
             "record_templates",
             "description",
             "registrar",
@@ -77,6 +85,9 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
             "tenant",
             "tags",
         )
+        labels = {
+            "soa_rname": _("RName"),
+        }
 
 
 class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
@@ -84,6 +95,7 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet("name", "nameserver_id", "description", name=_("Attributes")),
+        FieldSet("soa_mname_id", "soa_rname", name=_("SOA")),
         FieldSet("record_template_id", name=_("Record Templates")),
         FieldSet(
             "registrar_id",
@@ -105,6 +117,15 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Nameservers"),
     )
+    soa_mname_id = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("MName"),
+    )
+    soa_rname = forms.CharField(
+        required=False,
+        label=_("RName"),
+    )
     record_template_id = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
@@ -148,11 +169,17 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Nameservers"),
     )
+    soa_mname = CSVModelChoiceField(
+        queryset=NameServer.objects.all(),
+        to_field_name="name",
+        required=False,
+        label=_("SOA MName"),
+    )
     record_templates = CSVModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         to_field_name="name",
         required=False,
-        label=_("Record Remplates"),
+        label=_("Record Templates"),
     )
     registrar = CSVModelChoiceField(
         queryset=Registrar.objects.all(),
@@ -212,6 +239,8 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         fields = (
             "name",
             "nameservers",
+            "soa_mname",
+            "soa_rname",
             "record_templates",
             "description",
             "registrar",
@@ -230,12 +259,20 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Nameservers"),
     )
+    soa_mname = DynamicModelChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("MName"),
+    )
+    soa_rname = forms.CharField(max_length=255, required=False, label=_("RName"))
     record_templates = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
         label=_("Record Templates"),
     )
-    description = forms.CharField(max_length=200, required=False)
+    description = forms.CharField(
+        max_length=200, required=False, label=_("Description")
+    )
     registrar = DynamicModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
@@ -280,6 +317,11 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
             "description",
             name=_("Attributes"),
         ),
+        FieldSet(
+            "soa_mname",
+            "soa_rname",
+            name=_("SOA"),
+        ),
         FieldSet(
             "record_templates",
             name=_("Record Templates"),
@@ -298,6 +340,8 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
     nullable_fields = (
         "description",
         "nameservers",
+        "soa_mname",
+        "soa_rname",
         "record_templates",
         "registrar",
         "registrant",

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/graphql/types.py

@@ -219,6 +219,13 @@ class NetBoxDNSZoneTemplateType(NetBoxObjectType):
             "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")
         ]
     ]
+    soa_mname: (
+        Annotated[
+            "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")
+        ]
+        | None
+    )
+    soa_rname: str | None
     record_templates: List[
         Annotated[
             "NetBoxDNSRecordTemplateType", strawberry.lazy("netbox_dns.graphql.types")

netbox_plugin_dns-1.2.4/netbox_dns/migrations/0013_zonetemplate_soa_mname_zonetemplate_soa_rname.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.1.5 on 2025-02-17 11:37
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0012_natural_ordering"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zonetemplate",
+            name="soa_mname",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="+",
+                to="netbox_dns.nameserver",
+            ),
+        ),
+        migrations.AddField(
+            model_name="zonetemplate",
+            name="soa_rname",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]

netbox_plugin_dns-1.2.4/netbox_dns/models/__init__.py

@@ -0,0 +1,8 @@
+from .zone import *
+from .nameserver import *
+from .record import *
+from .view import *
+from .registration_contact import *
+from .registrar import *
+from .zone_template import *
+from .record_template import *

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/nameserver.py

@@ -69,6 +69,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def display_name(self):
         return name_to_unicode(self.name)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/record.py

@@ -263,6 +263,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_status_color(self):
         return RecordStatusChoices.colors.get(self.status)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:record", kwargs={"pk": self.pk})
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/record_template.py

@@ -104,6 +104,7 @@ class RecordTemplate(NetBoxModel):
     def get_status_color(self):
         return RecordStatusChoices.colors.get(self.status)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:recordtemplate", kwargs={"pk": self.pk})
 
@@ -163,9 +164,11 @@ class RecordTemplate(NetBoxModel):
             record = Record.objects.create(**record_data)
         except ValidationError as exc:
             raise ValidationError(
-                _("Error while processing record template {template}: {error}").format(
-                    template=self, error=exc.messages[0]
-                )
+                {
+                    None: _(
+                        "Error while processing record template {template}: {error}"
+                    ).format(template=self, error=exc.messages[0])
+                }
             )
 
         if tags := self.tags.all():

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/registrar.py

@@ -57,6 +57,7 @@ class Registrar(NetBoxModel):
         blank=True,
     )
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:registrar", kwargs={"pk": self.pk})
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/registration_contact.py

@@ -118,6 +118,7 @@ class RegistrationContact(NetBoxModel):
         "tags",
     )
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:registrationcontact", kwargs={"pk": self.pk})
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/view.py

@@ -71,6 +71,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_default_view(cls):
         return cls.objects.get(default_view=True)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:view", kwargs={"pk": self.pk})
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/zone.py

@@ -350,6 +350,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_status_color(self):
         return ZoneStatusChoices.colors.get(self.status)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:zone", kwargs={"pk": self.pk})
 
@@ -670,15 +671,25 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 if value not in (None, ""):
                     setattr(self, field, value)
 
-        if self.soa_mname_id is None:
-            default_soa_mname = defaults.get("zone_soa_mname")
-            try:
-                self.soa_mname = NameServer.objects.get(name=default_soa_mname)
-            except NameServer.DoesNotExist:
-                raise ValidationError(
-                    _("Default soa_mname instance {nameserver} does not exist").format(
-                        nameserver=default_soa_mname
+        if self.soa_mname_id is None and "soa_mname" not in exclude:
+            if default_soa_mname := defaults.get("zone_soa_mname"):
+                try:
+                    self.soa_mname = NameServer.objects.get(name=default_soa_mname)
+                except NameServer.DoesNotExist:
+                    raise ValidationError(
+                        {
+                            "soa_mname": _(
+                                "Default soa_mname instance {nameserver} does not exist"
+                            ).format(nameserver=default_soa_mname)
+                        }
                     )
+            else:
+                raise ValidationError(
+                    {
+                        "soa_mname": _(
+                            "soa_mname not set and no template or default value defined"
+                        )
+                    }
                 )
 
         super().clean_fields(exclude=exclude)
@@ -706,7 +717,13 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             )
 
         if self.soa_rname in (None, ""):
-            raise ValidationError(_("soa_rname not set and no default value defined"))
+            raise ValidationError(
+                {
+                    "soa_rname": _(
+                        "soa_rname not set and no template or default value defined"
+                    ),
+                }
+            )
         try:
             dns_name.from_text(self.soa_rname, origin=dns_name.root)
             validate_rname(self.soa_rname)

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.4}/netbox_dns/models/zone_template.py

@@ -1,10 +1,16 @@
+from dns import name as dns_name
+from dns.exception import DNSException
+
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
 
+from netbox_dns.validators import validate_rname
+
 
 __all__ = (
     "ZoneTemplate",
@@ -30,6 +36,19 @@ class ZoneTemplate(NetBoxModel):
         related_name="+",
         blank=True,
     )
+    soa_mname = models.ForeignKey(
+        verbose_name=_("SOA MName"),
+        to="NameServer",
+        related_name="+",
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True,
+    )
+    soa_rname = models.CharField(
+        verbose_name=_("SOA RName"),
+        max_length=255,
+        blank=True,
+    )
     record_templates = models.ManyToManyField(
         verbose_name=_("Record Templates"),
         to="RecordTemplate",
@@ -98,6 +117,8 @@ class ZoneTemplate(NetBoxModel):
     )
 
     template_fields = (
+        "soa_mname",
+        "soa_rname",
         "tenant",
         "registrar",
         "registrant",
@@ -115,31 +136,44 @@ class ZoneTemplate(NetBoxModel):
     def __str__(self):
         return str(self.name)
 
+    # TODO: Remove in version 1.3.0 (NetBox #18555)
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:zonetemplate", kwargs={"pk": self.pk})
 
-    def apply_to_zone(self, zone):
+    def apply_to_zone_data(self, data):
+        fields_changed = False
+        for field in self.template_fields:
+            if data.get(field) in (None, "") and getattr(self, field) not in (None, ""):
+                fields_changed = True
+                data[field] = getattr(self, field)
+
+        return fields_changed
+
+    def apply_to_zone_relations(self, zone):
         if not zone.nameservers.all() and self.nameservers.all():
             zone.nameservers.set(self.nameservers.all())
 
         if not zone.tags.all() and self.tags.all():
             zone.tags.set(self.tags.all())
 
-        fields_changed = True
-        for field in self.template_fields:
-            if getattr(zone, field) is None and getattr(self, field) is not None:
-                fields_changed = True
-                setattr(zone, field, getattr(self, field))
-
-        if fields_changed:
-            zone.save()
-
         self.create_records(zone)
 
     def create_records(self, zone):
         for record_template in self.record_templates.all():
             record_template.create_record(zone=zone)
 
+    def clean(self, *args, **kwargs):
+        if self.soa_rname:
+            try:
+                dns_name.from_text(self.soa_rname, origin=dns_name.root)
+                validate_rname(self.soa_rname)
+            except (DNSException, ValidationError) as exc:
+                raise ValidationError(
+                    {
+                        "soa_rname": exc,
+                    }
+                )
+
 
 @register_search
 class ZoneTemplateIndex(SearchIndex):