netbox-plugin-dns 0.21.4__py3-none-any.whl → 1.4.7__py3-none-any.whl

netbox_dns/forms/zone.py

@@ -1,8 +1,10 @@
 from django import forms
+from django.db import models, transaction
 from django.conf import settings
-from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator, MaxValueValidator
-from django.urls import reverse_lazy
+from django.core.exceptions import ValidationError
+from django.contrib.postgres.forms import SimpleArrayField
+from django.utils.translation import gettext_lazy as _
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -10,141 +12,277 @@ from netbox.forms import (
     NetBoxModelImportForm,
     NetBoxModelForm,
 )
+from netbox.context import events_queue
 from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
     TagFilterField,
     CSVChoiceField,
     CSVModelChoiceField,
+    CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
+    CommentField,
 )
-from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
-from utilities.forms import add_blank_choice
-from tenancy.models import Tenant
+from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect
+from utilities.forms.rendering import FieldSet
+from utilities.forms import (
+    BOOLEAN_WITH_BLANK_CHOICES,
+    add_blank_choice,
+    get_field_value,
+)
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import (
     View,
     Zone,
-    ZoneStatusChoices,
     NameServer,
     Registrar,
-    Contact,
+    RegistrationContact,
+    ZoneTemplate,
+    DNSSECPolicy,
 )
-from netbox_dns.utilities import name_to_unicode
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
+from netbox_dns.utilities import name_to_unicode, network_to_reverse
+from netbox_dns.fields import RFC2317NetworkFormField, TimePeriodField
+from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
 
-class ZoneForm(TenancyForm, NetBoxModelForm):
-    nameservers = DynamicModelMultipleChoiceField(
-        queryset=NameServer.objects.all(),
-        required=False,
-    )
-    default_ttl = forms.IntegerField(
-        required=False,
-        label="Default TTL",
-        help_text="Default TTL for new records in this zone",
-        validators=[MinValueValidator(1)],
-    )
-    soa_ttl = forms.IntegerField(
-        required=True,
-        label="SOA TTL",
-        help_text="TTL for the SOA record of the zone",
-        validators=[MinValueValidator(1)],
-    )
-    soa_rname = forms.CharField(
-        required=True,
-        label="SOA Responsible",
-        help_text="Mailbox of the zone's administrator",
-    )
-    soa_serial_auto = forms.BooleanField(
-        required=False,
-        label="Generate SOA Serial",
-        help_text="Automatically generate the SOA Serial",
-    )
-    soa_serial = forms.IntegerField(
-        required=False,
-        label="SOA Serial",
-        help_text="Serial number of the current zone data version",
-        validators=[MinValueValidator(1)],
-    )
-    soa_refresh = forms.IntegerField(
-        required=True,
-        label="SOA Refresh",
-        help_text="Refresh interval for secondary name servers",
-        validators=[MinValueValidator(1)],
-    )
-    soa_retry = forms.IntegerField(
-        required=True,
-        label="SOA Retry",
-        help_text="Retry interval for secondary name servers",
-        validators=[MinValueValidator(1)],
-    )
-    soa_expire = forms.IntegerField(
-        required=True,
-        label="SOA Expire",
-        help_text="Expire time after which the zone is considered unavailable",
-        validators=[MinValueValidator(1)],
-    )
-    soa_minimum = forms.IntegerField(
-        required=True,
-        label="SOA Minimum TTL",
-        help_text="Minimum TTL for negative results, e.g. NXRRSET",
-        validators=[MinValueValidator(1)],
-    )
-    fieldsets = (
-        (
-            "Zone",
-            (
-                "view",
-                "name",
-                "status",
-                "nameservers",
-                "default_ttl",
-                "description",
-            ),
-        ),
-        (
-            "SOA",
-            (
-                "soa_ttl",
+__all__ = (
+    "ZoneForm",
+    "ZoneFilterForm",
+    "ZoneImportForm",
+    "ZoneBulkEditForm",
+)
+
+
+class RollbackTransaction(Exception):
+    pass
+
+
+class ZoneTemplateUpdateMixin:
+    def _check_soa_mname(self):
+        if (
+            self.cleaned_data.get("soa_mname") is None
+            and "soa_mname" in self.fields.keys()
+        ):
+            self.add_error(
                 "soa_mname",
-                "soa_rname",
-                "soa_refresh",
-                "soa_retry",
-                "soa_expire",
-                "soa_minimum",
-                "soa_serial_auto",
-                "soa_serial",
+                _("soa_mname not set and no template or default value defined"),
+            )
+
+    def clean(self, *args, **kwargs):
+        super().clean(*args, **kwargs)
+
+        if (template := self.cleaned_data.get("template")) is None:
+            self._check_soa_mname()
+            return
+
+        if not self.cleaned_data.get("nameservers") and template.nameservers.all():
+            self.cleaned_data["nameservers"] = template.nameservers.all()
+
+        if not self.cleaned_data.get("tags") and template.tags.all():
+            self.cleaned_data["tags"] = template.tags.all()
+
+        for field in template.template_fields:
+            if self.cleaned_data.get(field) in (None, "", []) and getattr(
+                template, field
+            ) not in (None, "", []):
+                self.cleaned_data[field] = getattr(template, field)
+
+        self._check_soa_mname()
+
+        if self.errors:
+            return
+
+        saved_events_queue = events_queue.get()
+
+        try:
+            with transaction.atomic():
+                if self.instance.id is not None:
+                    zone = super().save(*args, **kwargs)
+                else:
+                    zone_data = self.cleaned_data.copy()
+
+                    custom_fields = {}
+                    for key, value in zone_data.copy().items():
+                        if key.startswith("cf_"):
+                            if isinstance(value, models.Model):
+                                custom_fields[key[3:]] = value.pk
+                            elif isinstance(value, models.QuerySet):
+                                custom_fields[key[3:]] = list(
+                                    value.values_list("pk", flat=True)
+                                )
+                            else:
+                                custom_fields[key[3:]] = value
+                            zone_data.pop(key)
+                    if custom_fields:
+                        zone_data["custom_field_data"] = custom_fields
+
+                    zone_data.pop("template", None)
+                    zone_data.pop("tenant_group", None)
+                    zone_data.pop("_init_time", None)
+
+                    nameservers = zone_data.pop("nameservers")
+                    tags = zone_data.pop("tags")
+
+                    zone = Zone.objects.create(**zone_data)
+
+                    zone.nameservers.set(nameservers)
+                    zone.tags.set(tags)
+
+                template.create_records(zone)
+                raise RollbackTransaction
+
+        except ValidationError as exc:
+            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)
+
+        return self.cleaned_data
+
+    def save(self, *args, **kwargs):
+        zone = super().save(*args, **kwargs)
+
+        if (template := self.cleaned_data.get("template")) is not None:
+            template.create_records(zone)
+
+        return zone
+
+
+class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
+    class Meta:
+        model = Zone
+
+        fields = (
+            "name",
+            "view",
+            "status",
+            "template",
+            "nameservers",
+            "default_ttl",
+            "description",
+            "soa_ttl",
+            "soa_mname",
+            "soa_rname",
+            "soa_serial_auto",
+            "soa_serial",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            "dnssec_policy",
+            "parental_agents",
+            "registrar",
+            "registry_domain_id",
+            "expiration_date",
+            "domain_status",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            "tenant_group",
+            "tenant",
+            "comments",
+            "tags",
+        )
+
+        labels = {
+            "soa_serial_auto": _("Generate SOA Serial"),
+            "rfc2317_parent_managed": _("RFC2317 Parent Managed"),
+        }
+
+        help_texts = {
+            "soa_serial_auto": _("Automatically generate the SOA serial number"),
+            "rfc2317_parent_managed": _(
+                "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
             ),
+        }
+
+        widgets = {
+            "dnssec_policy": HTMXSelect(),
+            "registrar": HTMXSelect(),
+            "expiration_date": DatePicker,
+        }
+
+    fieldsets = (
+        FieldSet(
+            "view",
+            "name",
+            "template",
+            "status",
+            "nameservers",
+            "default_ttl",
+            "description",
+            name=_("Zone"),
         ),
-        (
-            "Domain Registration",
-            (
-                "registrar",
-                "registry_domain_id",
-                "registrant",
-                "admin_c",
-                "tech_c",
-                "billing_c",
-            ),
+        FieldSet(
+            "soa_ttl",
+            "soa_mname",
+            "soa_rname",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "soa_serial_auto",
+            "soa_serial",
+            name=_("SOA"),
+        ),
+        FieldSet(
+            "dnssec_policy",
+            "parental_agents",
+            name=_("DNSSEC"),
+        ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            name=_("RFC2317"),
+        ),
+        FieldSet(
+            "registrar",
+            "registry_domain_id",
+            "expiration_date",
+            "domain_status",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            name=_("Domain Registration"),
+        ),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
         ),
-        ("Tags", ("tags",)),
-        ("Tenancy", ("tenant_group", "tenant")),
     )
 
     def __init__(self, *args, **kwargs):
-        """Override the __init__ method in order to provide the initial value for the default fields"""
         super().__init__(*args, **kwargs)
 
         initial_name = self.initial.get("name")
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
 
-        defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
-
-        def _initialize(initial, setting):
-            if initial.get(setting, None) in (None, ""):
-                initial[setting] = defaults.get(f"zone_{setting}", None)
+        if self.initial.get("view") is None:
+            self.initial["view"] = View.get_default_view()
 
+        defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
         for setting in (
             "default_ttl",
             "soa_ttl",
@@ -155,16 +293,14 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
             "soa_expire",
             "soa_minimum",
         ):
-            _initialize(self.initial, setting)
-
-        if self.initial.get("soa_ttl", None) is None:
-            self.initial["soa_ttl"] = self.initial.get("default_ttl", None)
+            if self.initial.get(setting) in (None, ""):
+                self.initial[setting] = defaults.get(f"zone_{setting}")
 
-        if self.initial.get("soa_serial_auto"):
-            self.initial["soa_serial"] = None
+        if self.initial.get("soa_ttl") is None:
+            self.initial["soa_ttl"] = self.initial.get("default_ttl")
 
-        if self.initial.get("soa_mname", None) in (None, ""):
-            default_soa_mname = defaults.get("zone_soa_mname", None)
+        if self.initial.get("soa_mname") is None:
+            default_soa_mname = defaults.get("zone_soa_mname")
             if default_soa_mname is not None:
                 try:
                     self.initial["soa_mname"] = NameServer.objects.get(
@@ -180,6 +316,106 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
                     name__in=default_nameservers
                 )
 
+        if not get_field_value(self, "dnssec_policy"):
+            del self.fields["parental_agents"]
+
+        if not get_field_value(self, "registrar"):
+            del self.fields["registry_domain_id"]
+            del self.fields["expiration_date"]
+            del self.fields["domain_status"]
+
+    view = DynamicModelChoiceField(
+        queryset=View.objects.all(),
+        required=True,
+        label=_("View"),
+    )
+    name = forms.CharField(
+        required=True,
+        label=_("Name"),
+    )
+    template = DynamicModelChoiceField(
+        queryset=ZoneTemplate.objects.all(),
+        required=False,
+        label=_("Template"),
+    )
+    status = forms.ChoiceField(
+        choices=ZoneStatusChoices,
+        required=False,
+        label=_("Status"),
+    )
+    nameservers = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("Nameservers"),
+    )
+    default_ttl = TimePeriodField(
+        required=False,
+        help_text=_("Default TTL for new records in this zone"),
+        validators=[MinValueValidator(1)],
+        label=_("Default TTL"),
+    )
+    soa_ttl = TimePeriodField(
+        required=True,
+        help_text=_("TTL for the SOA record of the zone"),
+        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=False,
+        help_text=_("Mailbox of the zone's administrator"),
+        label=_("SOA RName"),
+    )
+    soa_refresh = TimePeriodField(
+        required=True,
+        help_text=_("Refresh interval for secondary nameservers"),
+        validators=[MinValueValidator(1)],
+        label=_("SOA Refresh"),
+    )
+    soa_retry = TimePeriodField(
+        required=True,
+        help_text=_("Retry interval for secondary nameservers"),
+        validators=[MinValueValidator(1)],
+        label=_("SOA Retry"),
+    )
+    soa_expire = TimePeriodField(
+        required=True,
+        validators=[MinValueValidator(1)],
+        help_text=_("Expire time after which the zone is considered unavailable"),
+        label=_("SOA Expire"),
+    )
+    soa_minimum = TimePeriodField(
+        required=True,
+        help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
+        validators=[MinValueValidator(1)],
+        label=_("SOA Minimum TTL"),
+    )
+    soa_serial = forms.IntegerField(
+        required=False,
+        validators=[MinValueValidator(1)],
+        label=_("SOA Serial"),
+    )
+
+    parental_agents = SimpleArrayField(
+        required=False,
+        base_field=forms.GenericIPAddressField(),
+        label=_("Parental Agents"),
+    )
+
+    rfc2317_prefix = RFC2317NetworkFormField(
+        required=False,
+        validators=[validate_ipv4, validate_prefix, validate_rfc2317],
+        help_text=_("RFC2317 IPv4 prefix with a length of at least 25 bits"),
+        label=_("RFC2317 Prefix"),
+    )
+
+    comments = CommentField()
+
     def clean_default_ttl(self):
         return (
             self.cleaned_data["default_ttl"]
@@ -187,17 +423,206 @@ class ZoneForm(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 ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
+    model = Zone
+
+    fieldsets = (
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
+        FieldSet(
+            "view_id",
+            "status",
+            "name",
+            "nameserver_id",
+            "active",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "soa_mname_id",
+            "soa_rname",
+            "soa_serial_auto",
+            name=_("SOA"),
+        ),
+        FieldSet(
+            "dnssec_policy_id",
+            "inline_signing",
+            "parental_agents",
+            name=_("DNSSEC"),
+        ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            "rfc2317_parent_zone_id",
+            name=_("RFC2317"),
+        ),
+        FieldSet(
+            "registrar_id",
+            "registry_domain_id",
+            "expiration_date_before",
+            "expiration_date_after",
+            "domain_status",
+            "registrant_id",
+            "admin_c_id",
+            "tech_c_id",
+            "billing_c_id",
+            name=_("Registration"),
+        ),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
+    )
+
+    view_id = DynamicModelMultipleChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        label=_("View"),
+    )
+    status = forms.MultipleChoiceField(
+        choices=ZoneStatusChoices,
+        required=False,
+        label=_("Status"),
+    )
+    name = forms.CharField(
+        required=False,
+        label=_("Name"),
+    )
+    nameserver_id = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Nameservers"),
+    )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
+    )
+    description = forms.CharField(
+        required=False,
+        label=_("Description"),
+    )
+    soa_mname_id = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("MName"),
+    )
+    soa_rname = forms.CharField(
+        required=False,
+        label=_("RName"),
+    )
+    soa_serial_auto = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Generate SOA Serial"),
+    )
+    rfc2317_prefix = RFC2317NetworkFormField(
+        required=False,
+        label=_("Prefix"),
+    )
+    rfc2317_parent_managed = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Parent Managed"),
+    )
+    rfc2317_parent_zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Parent Zone"),
+    )
+    dnssec_policy_id = DynamicModelMultipleChoiceField(
+        queryset=DNSSECPolicy.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("DNSSEC Policy"),
+    )
+    inline_signing = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("DNSSEC Policy uses inline signing"),
+    )
+    parental_agents = forms.GenericIPAddressField(
+        required=False,
+        label=_("Parental Agents"),
+    )
+    registrar_id = DynamicModelMultipleChoiceField(
+        queryset=Registrar.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Registrar"),
+    )
+    registry_domain_id = forms.CharField(
+        required=False,
+        label=_("Registry Domain ID"),
+    )
+    expiration_date_after = forms.DateField(
+        required=False,
+        label=_("Expiration Date after"),
+        widget=DatePicker,
+    )
+    expiration_date_before = forms.DateField(
+        required=False,
+        label=_("Expiration Date before"),
+        widget=DatePicker,
+    )
+    domain_status = forms.MultipleChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
+    registrant_id = DynamicModelMultipleChoiceField(
+        queryset=RegistrationContact.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Registrant"),
+    )
+    admin_c_id = DynamicModelMultipleChoiceField(
+        queryset=RegistrationContact.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Administrative Contact"),
+    )
+    tech_c_id = DynamicModelMultipleChoiceField(
+        queryset=RegistrationContact.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Technical Contact"),
+    )
+    billing_c_id = DynamicModelMultipleChoiceField(
+        queryset=RegistrationContact.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Billing Contact"),
+    )
+    tag = TagFilterField(Zone)
+
+
+class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
     class Meta:
         model = Zone
 
         fields = (
-            "name",
             "view",
+            "name",
             "status",
+            "template",
             "nameservers",
             "default_ttl",
             "description",
-            "tags",
             "soa_ttl",
             "soa_mname",
             "soa_rname",
@@ -207,442 +632,413 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
             "soa_retry",
             "soa_expire",
             "soa_minimum",
+            "dnssec_policy",
+            "parental_agents",
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
             "billing_c",
             "tenant",
+            "comments",
+            "tags",
         )
-        help_texts = {
-            "view": "View the zone belongs to",
-            "soa_mname": "Primary name server for the zone",
-        }
 
-
-class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
-    model = Zone
-    fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("view_id", "status", "name", "nameservers")),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
-    )
-
-    view_id = DynamicModelMultipleChoiceField(
-        queryset=View.objects.all(),
-        required=False,
-        label="View",
-    )
-    status = forms.ChoiceField(
-        choices=add_blank_choice(ZoneStatusChoices),
-        required=False,
-    )
-    name = forms.CharField(
-        required=False,
-        label="Name",
-    )
-    nameservers = DynamicModelMultipleChoiceField(
-        queryset=NameServer.objects.all(),
-        required=False,
-    )
-    tag = TagFilterField(Zone)
-
-
-class ZoneImportForm(NetBoxModelImportForm):
     view = CSVModelChoiceField(
         queryset=View.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="View the zone belongs to",
         error_messages={
-            "invalid_choice": "View not found.",
+            "invalid_choice": _("View %(value)s not found"),
         },
+        label=_("View"),
     )
     status = CSVChoiceField(
         choices=ZoneStatusChoices,
         required=False,
-        help_text="Zone status",
+        label=_("Status"),
     )
-    default_ttl = forms.IntegerField(
+    nameservers = CSVModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        to_field_name="name",
         required=False,
-        help_text="Default TTL",
+        label=_("Nameservers"),
     )
-    soa_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
-        help_text="TTL for the SOA record of the zone",
+        label=_("Default TTL"),
+    )
+    soa_ttl = TimePeriodField(
+        required=False,
+        help_text=_("TTL for the SOA record of the zone"),
+        label=_("SOA TTL"),
     )
     soa_mname = CSVModelChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="Primary name server for the zone",
         error_messages={
-            "invalid_choice": "Nameserver not found.",
+            "invalid_choice": _("Nameserver %(value)s not found"),
         },
+        help_text=_("Primary nameserver for the zone"),
+        label=_("SOA MName"),
     )
     soa_rname = forms.CharField(
         required=False,
-        help_text="Mailbox of the zone's administrator",
+        help_text=_("Mailbox of the zone's administrator"),
+        label=_("SOA RName"),
     )
     soa_serial_auto = forms.BooleanField(
         required=False,
-        help_text="Generate the SOA serial",
+        label=_("Generate SOA Serial"),
     )
     soa_serial = forms.IntegerField(
         required=False,
-        help_text="Serial number of the current zone data version",
+        label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
-        help_text="Refresh interval for secondary name servers",
+        help_text=_("Refresh interval for secondary nameservers"),
+        label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
-        help_text="Retry interval for secondary name servers",
+        help_text=_("Retry interval for secondary nameservers"),
+        label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
-        help_text="Expire time after which the zone is considered unavailable",
+        help_text=_("Expire time after which the zone is considered unavailable"),
+        label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
-        help_text="Minimum TTL for negative results, e.g. NXRRSET",
+        help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
+        label=_("SOA Minimum TTL"),
+    )
+    rfc2317_prefix = RFC2317NetworkFormField(
+        required=False,
+        help_text=_("RFC2317 IPv4 prefix with a length of at least 25 bits"),
+        label=_("RFC2317 Prefix"),
+    )
+    rfc2317_parent_managed = forms.BooleanField(
+        required=False,
+        help_text=_(
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
+        ),
+        label=_("RFC2317 Parent Managed"),
+    )
+    dnssec_policy = CSVModelChoiceField(
+        queryset=DNSSECPolicy.objects.all(),
+        required=False,
+        to_field_name="name",
+        error_messages={
+            "invalid_choice": _("DNSSEC policy %(value)s not found"),
+        },
+        label=_("DNSSEC Policy"),
     )
     registrar = CSVModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="Registrar the domain is registered with",
         error_messages={
-            "invalid_choice": "Registrar not found.",
+            "invalid_choice": _("Registrar %(value)s not found"),
         },
+        label=_("Registrar"),
     )
     registry_domain_id = forms.CharField(
         required=False,
-        help_text="Domain ID assigned by the registry",
+        label=_("Registry Domain ID"),
+    )
+    domain_status = CSVChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
     )
     registrant = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Owner of the domain",
         error_messages={
-            "invalid_choice": "Registrant contact ID not found",
+            "invalid_choice": _("Registrant contact ID %(value)s not found"),
         },
+        label=_("Registrant"),
     )
     admin_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Administrative contact for the domain",
         error_messages={
-            "invalid_choice": "Administrative contact ID not found",
+            "invalid_choice": _("Administrative contact ID %(value)s not found"),
         },
+        label=_("Administrative Contact"),
     )
     tech_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Technical contact for the domain",
         error_messages={
-            "invalid_choice": "Technical contact ID not found",
+            "invalid_choice": _("Technical contact ID %(value)s not found"),
         },
+        label=_("Technical Contact"),
     )
     billing_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Billing contact for the domain",
         error_messages={
-            "invalid_choice": "Billing contact ID not found",
+            "invalid_choice": _("Billing contact ID not found"),
         },
+        label=_("Billing Contact"),
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="Assigned tenant",
+        label=_("Tenant"),
+    )
+    template = CSVModelChoiceField(
+        queryset=ZoneTemplate.objects.all(),
+        required=False,
+        to_field_name="name",
+        label=_("Template"),
     )
 
-    def _get_default_value(self, field):
-        _default_values = settings.PLUGINS_CONFIG.get("netbox_dns", {})
-        if _default_values.get("zone_soa_ttl", None) is None:
-            _default_values["zone_soa_ttl"] = _default_values.get(
-                "zone_default_ttl", None
-            )
-
-        return _default_values.get(f"zone_{field}", None)
-
-    def _clean_field_with_defaults(self, field):
-        if self.cleaned_data[field]:
-            value = self.cleaned_data[field]
-        else:
-            value = self._get_default_value(field)
-
-        if value is None:
-            raise ValidationError(f"{field} not set and no default value available")
-
-        return value
-
-    def clean_default_ttl(self):
-        return self._clean_field_with_defaults("default_ttl")
-
-    def clean_soa_ttl(self):
-        return self._clean_field_with_defaults("soa_ttl")
-
-    def clean_soa_mname(self):
-        soa_mname = self._clean_field_with_defaults("soa_mname")
-        if isinstance(soa_mname, str):
-            try:
-                soa_mname = NameServer.objects.get(name=soa_mname)
-            except NameServer.DoesNotExist:
-                raise ValidationError(f"Default name server {soa_mname} does not exist")
-
-        return soa_mname
-
-    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
+    def clean_view(self):
+        view = self.cleaned_data.get("view")
+        if view is None:
+            return View.get_default_view()
 
-            raise
+        return view
 
-    def clean_soa_refresh(self):
-        return self._clean_field_with_defaults("soa_refresh")
+    def clean_nameservers(self):
+        nameservers = self.cleaned_data.get("nameservers")
+        zone_defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
 
-    def clean_soa_retry(self):
-        return self._clean_field_with_defaults("soa_retry")
+        if (
+            self.data.get("nameservers") is None
+            and zone_defaults.get("zone_nameservers") is not None
+        ):
+            nameservers = NameServer.objects.filter(
+                name__in=zone_defaults.get("zone_nameservers")
+            )
 
-    def clean_soa_expire(self):
-        return self._clean_field_with_defaults("soa_expire")
+        return nameservers
 
-    def clean_soa_minimum(self):
-        return self._clean_field_with_defaults("soa_minimum")
 
-    class Meta:
-        model = Zone
+class ZoneBulkEditForm(NetBoxModelBulkEditForm):
+    model = Zone
 
-        fields = (
+    fieldsets = (
+        FieldSet(
             "view",
-            "name",
             "status",
+            "nameservers",
             "default_ttl",
             "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
             "soa_ttl",
             "soa_mname",
             "soa_rname",
-            "soa_serial_auto",
-            "soa_serial",
             "soa_refresh",
             "soa_retry",
             "soa_expire",
             "soa_minimum",
+            "soa_serial_auto",
+            "soa_serial",
+            name=_("SOA"),
+        ),
+        FieldSet(
+            "dnssec_policy",
+            "parental_agents",
+            name=_("DNSSEC"),
+        ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            name=_("RFC2317"),
+        ),
+        FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
             "billing_c",
+            name=_("Domain Registration"),
+        ),
+        FieldSet(
+            "tenant_group",
             "tenant",
-        )
+            name=_("Tenancy"),
+        ),
+    )
 
+    nullable_fields = (
+        "description",
+        "nameservers",
+        "rfc2317_prefix",
+        "registrar",
+        "expiration_date",
+        "domain_status",
+        "registry_domain_id",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "tenant",
+        "comments",
+    )
 
-class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label="View",
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:view-list")}
-        ),
+        label=_("View"),
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(ZoneStatusChoices),
         required=False,
+        label=_("Status"),
     )
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        label=_("Nameservers"),
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
-        label="Default TTL",
         validators=[MinValueValidator(1)],
+        label=_("Default TTL"),
+    )
+    description = forms.CharField(
+        max_length=200,
+        required=False,
+        label=_("Description"),
     )
-    description = forms.CharField(max_length=200, required=False)
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=False,
-        label="SOA TTL",
         validators=[MinValueValidator(1)],
+        label=_("SOA TTL"),
     )
     soa_mname = DynamicModelChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
-        label="SOA Primary Nameserver",
-        widget=APISelect(
-            attrs={
-                "data-url": reverse_lazy("plugins-api:netbox_dns-api:nameserver-list")
-            }
-        ),
+        label=_("SOA MName"),
     )
     soa_rname = forms.CharField(
         required=False,
-        label="SOA Responsible",
+        label=_("SOA RName"),
     )
     soa_serial_auto = forms.NullBooleanField(
         required=False,
         widget=BulkEditNullBooleanSelect(),
-        label="Generate SOA Serial",
+        label=_("Generate SOA Serial"),
     )
     soa_serial = forms.IntegerField(
         required=False,
-        label="SOA Serial",
         validators=[MinValueValidator(1), MaxValueValidator(4294967295)],
+        label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
-        label="SOA Refresh",
         validators=[MinValueValidator(1)],
+        label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
-        label="SOA Retry",
         validators=[MinValueValidator(1)],
+        label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
-        label="SOA Expire",
         validators=[MinValueValidator(1)],
+        label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
-        label="SOA Minimum TTL",
         validators=[MinValueValidator(1)],
+        label=_("SOA Minimum TTL"),
+    )
+    rfc2317_prefix = RFC2317NetworkFormField(
+        required=False,
+        validators=[validate_ipv4, validate_prefix, validate_rfc2317],
+        help_text=_("RFC2317 IPv4 prefix with a length of at least 25 bits"),
+        label=_("RFC2317 Prefix"),
+    )
+    rfc2317_parent_managed = forms.NullBooleanField(
+        required=False,
+        widget=BulkEditNullBooleanSelect(),
+        help_text=_(
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
+        ),
+        label=_("RFC2317 Parent Managed"),
+    )
+    dnssec_policy = DynamicModelChoiceField(
+        queryset=DNSSECPolicy.objects.all(),
+        required=False,
+        label=_("DNSSEC Policy"),
+    )
+    parental_agents = SimpleArrayField(
+        required=False,
+        base_field=forms.GenericIPAddressField(),
+        label=_("Parental Agents"),
     )
     registrar = DynamicModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
-        widget=APISelect(
-            attrs={
-                "data-url": reverse_lazy("plugins-api:netbox_dns-api:registrar-list")
-            }
-        ),
+        label=_("Registrar"),
     )
     registry_domain_id = forms.CharField(
         required=False,
-        label="Registry Domain ID",
+        label=_("Registry Domain ID"),
+    )
+    expiration_date = forms.DateField(
+        required=False,
+        label=_("Expiration Date"),
+        widget=DatePicker,
+    )
+    domain_status = forms.ChoiceField(
+        choices=add_blank_choice(ZoneEPPStatusChoices),
+        required=False,
+        label=_("Domain Status"),
     )
     registrant = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:contact-list")}
-        ),
+        label=_("Registrant"),
     )
     admin_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Administrative Contact",
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:contact-list")}
-        ),
+        label=_("Administrative Contact"),
     )
     tech_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Technical Contact",
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:contact-list")}
-        ),
+        label=_("Technical Contact"),
     )
     billing_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Billing Contact",
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:contact-list")}
-        ),
+        label=_("Billing Contact"),
     )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
+    tenant_group = DynamicModelChoiceField(
+        queryset=TenantGroup.objects.all(),
         required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
-
-    model = Zone
-
-    fieldsets = (
-        (
-            None,
-            (
-                "view",
-                "status",
-                "nameservers",
-                "default_ttl",
-                "description",
-                "tenant",
-            ),
-        ),
-        (
-            "SOA",
-            (
-                "soa_ttl",
-                "soa_mname",
-                "soa_rname",
-                "soa_serial_auto",
-                "soa_serial",
-                "soa_refresh",
-                "soa_retry",
-                "soa_expire",
-                "soa_minimum",
-            ),
-        ),
-        (
-            "Domain Registration",
-            (
-                "registrar",
-                "registry_domain_id",
-                "registrant",
-                "admin_c",
-                "tech_c",
-                "billing_c",
-            ),
-        ),
+        label=_("Tenant Group"),
     )
-    nullable_fields = (
-        "view",
-        "description",
-        "registrar",
-        "registry_domain_id",
-        "registrant",
-        "admin_c",
-        "tech_c",
-        "billing_c",
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        label=_("Tenant"),
     )
-
-    def clean(self):
-        """
-        If soa_serial_auto is True, set soa_serial to None.
-        """
-        cleaned_data = super().clean()
-        if cleaned_data.get("soa_serial_auto"):
-            cleaned_data["soa_serial"] = None
+    comments = CommentField()