netbox-plugin-dns 1.2.7b3__py3-none-any.whl → 1.2.9__py3-none-any.whl

netbox_dns/filtersets/zone.py

@@ -1,4 +1,5 @@
 import netaddr
+from netaddr.core import AddrFormatError
 
 import django_filters
 from django.db.models import Q
@@ -16,7 +17,7 @@ from netbox_dns.models import (
     NameServer,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
 
 
 __all__ = ("ZoneFilterSet",)
@@ -68,6 +69,10 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("DNSSEC Policy"),
     )
+    parental_agents = MultiValueCharFilter(
+        method="filter_parental_agents",
+        label=_("Parental Agents"),
+    )
     rfc2317_prefix = MultiValueCharFilter(
         method="filter_rfc2317_prefix",
         label=_("RFC2317 Prefix"),
@@ -86,7 +91,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
-        label="Registrar ID",
+        label=_("Registrar ID"),
     )
     registrar = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
@@ -94,6 +99,10 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("Registrar"),
     )
+    expiration_date = django_filters.DateFromToRangeFilter()
+    domain_status = django_filters.MultipleChoiceFilter(
+        choices=ZoneEPPStatusChoices,
+    )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         label=_("Registrant ID"),
@@ -160,8 +169,22 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "rfc2317_parent_managed",
             "inline_signing",
             "registry_domain_id",
+            "domain_status",
         )
 
+    def filter_parental_agents(self, queryset, name, value):
+        if not value:
+            return queryset
+
+        query_values = []
+        for v in value:
+            try:
+                query_values.append(str(netaddr.IPAddress(v)))
+            except (AddrFormatError, ValueError):
+                pass
+
+        return queryset.filter(parental_agents__overlap=query_values)
+
     def filter_arpa_network(self, queryset, name, value):
         if not value:
             return queryset

netbox_dns/filtersets/zone_template.py

@@ -48,13 +48,13 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=NameServer.objects.all(),
         field_name="soa_mname",
         to_field_name="id",
-        label=_("SOA MNAME 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"),
+        label=_("SOA MName"),
     )
     dnssec_policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DNSSECPolicy.objects.all(),

netbox_dns/forms/dnssec_key_template.py

@@ -68,7 +68,7 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet("name", "description", name=_("Attributes")),
-        FieldSet("policies_id", name=_("Policies")),
+        FieldSet("policiy_id", name=_("Policies")),
         FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
         FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
@@ -79,9 +79,10 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     description = forms.CharField(
         required=False,
     )
-    policies_id = DynamicModelMultipleChoiceField(
+    policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Policies"),
     )
     type = forms.MultipleChoiceField(

netbox_dns/forms/dnssec_policy.py

@@ -85,37 +85,6 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         help_text=_("Select CSK or KSK/ZSK templates for signing"),
         quick_add=QUICK_ADD,
     )
-
-    class Meta:
-        model = DNSSECPolicy
-        fields = (
-            "name",
-            "description",
-            "status",
-            "key_templates",
-            "dnskey_ttl",
-            "purge_keys",
-            "publish_safety",
-            "retire_safety",
-            "signatures_jitter",
-            "signatures_refresh",
-            "signatures_validity",
-            "signatures_validity_dnskey",
-            "max_zone_ttl",
-            "zone_propagation_delay",
-            "create_cdnskey",
-            "cds_digest_types",
-            "parent_ds_ttl",
-            "parent_propagation_delay",
-            "use_nsec3",
-            "nsec3_iterations",
-            "nsec3_opt_out",
-            "nsec3_salt_size",
-            "tenant_group",
-            "tenant",
-            "tags",
-        )
-
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),
@@ -177,6 +146,36 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         placeholder=DNSSECPolicy.get_fallback_setting("parent_propagation_delay"),
     )
 
+    class Meta:
+        model = DNSSECPolicy
+        fields = (
+            "name",
+            "description",
+            "status",
+            "key_templates",
+            "dnskey_ttl",
+            "purge_keys",
+            "publish_safety",
+            "retire_safety",
+            "signatures_jitter",
+            "signatures_refresh",
+            "signatures_validity",
+            "signatures_validity_dnskey",
+            "max_zone_ttl",
+            "zone_propagation_delay",
+            "create_cdnskey",
+            "cds_digest_types",
+            "parent_ds_ttl",
+            "parent_propagation_delay",
+            "use_nsec3",
+            "nsec3_iterations",
+            "nsec3_opt_out",
+            "nsec3_salt_size",
+            "tenant_group",
+            "tenant",
+            "tags",
+        )
+
 
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = DNSSECPolicy
@@ -186,12 +185,12 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "name",
             "description",
             "status",
-            "key_templates_id",
+            "key_template_id",
             name=_("Attributes"),
         ),
         FieldSet(
-            "zones_id",
-            "zone_templates_id",
+            "zone_id",
+            "zone_template_id",
             name=_("Assignments"),
         ),
         FieldSet(
@@ -236,19 +235,22 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
-    key_templates_id = DynamicModelMultipleChoiceField(
+    key_template_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Key Templates"),
     )
-    zones_id = DynamicModelMultipleChoiceField(
+    zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zones"),
     )
-    zone_templates_id = DynamicModelMultipleChoiceField(
+    zone_template_id = DynamicModelMultipleChoiceField(
         queryset=ZoneTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zone Templates"),
     )
     dnskey_ttl = TimePeriodField(

netbox_dns/forms/nameserver.py

@@ -64,11 +64,13 @@ class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zones"),
     )
     soa_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("SOA Zones"),
     )
     description = forms.CharField(

netbox_dns/forms/record_template.py

@@ -146,6 +146,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     zone_template_id = DynamicModelMultipleChoiceField(
         queryset=ZoneTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zone Templates"),
     )
     tag = TagFilterField(RecordTemplate)

netbox_dns/forms/zone.py

@@ -5,6 +5,7 @@ from django.db import transaction
 from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 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 (
@@ -23,7 +24,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
 )
 from utilities.release import load_release_data
-from utilities.forms.widgets import BulkEditNullBooleanSelect
+from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker
 from utilities.forms.rendering import FieldSet
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
 from tenancy.models import Tenant, TenantGroup
@@ -38,7 +39,7 @@ from netbox_dns.models import (
     ZoneTemplate,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+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
@@ -59,10 +60,21 @@ class RollbackTransaction(Exception):
 
 
 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_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():
@@ -77,11 +89,7 @@ class ZoneTemplateUpdateMixin:
             ) not in (None, ""):
                 self.cleaned_data[field] = getattr(template, field)
 
-        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"),
-            )
+        self._check_soa_mname()
 
         if self.errors:
             return
@@ -235,6 +243,12 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         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],
@@ -275,6 +289,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         FieldSet(
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -285,6 +300,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -377,8 +394,11 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "rfc2317_parent_managed",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -387,8 +407,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "tenant",
             "tags",
         )
-        help_texts = {
-            "soa_mname": _("Primary nameserver for the zone"),
+        widgets = {
+            "expiration_date": DatePicker,
         }
 
 
@@ -412,8 +432,9 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             name=_("SOA"),
         ),
         FieldSet(
-            "dnssec_policy",
+            "dnssec_policy_id",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -425,6 +446,9 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         FieldSet(
             "registrar_id",
             "registry_domain_id",
+            "expiration_date_before",
+            "expiration_date_after",
+            "domain_status",
             "registrant_id",
             "admin_c_id",
             "tech_c_id",
@@ -451,6 +475,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     active = forms.NullBooleanField(
@@ -488,40 +513,71 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     rfc2317_parent_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Parent Zone"),
     )
-    registrar_id = DynamicModelMultipleChoiceField(
-        queryset=Registrar.objects.all(),
-        required=False,
-        label=_("Registrar"),
-    )
     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=_("Use Inline Signing"),
+    )
+    parental_agents = forms.GenericIPAddressField(
+        required=False,
+        label=_("Parental Agent"),
+    )
+    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)
@@ -638,6 +694,11 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("Registry Domain ID"),
     )
+    domain_status = CSVChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
@@ -709,10 +770,13 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "soa_minimum",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "rfc2317_prefix",
             "rfc2317_parent_managed",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -837,6 +901,11 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         widget=BulkEditNullBooleanSelect(),
         label=_("Use Inline Signing"),
     )
+    parental_agents = SimpleArrayField(
+        required=False,
+        base_field=forms.GenericIPAddressField(),
+        label=_("Parental Agents"),
+    )
     registrar = DynamicModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
@@ -846,6 +915,16 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         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=RegistrationContact.objects.all(),
         required=False,
@@ -903,6 +982,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -913,6 +993,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -927,6 +1009,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "nameservers",
         "rfc2317_prefix",
         "registrar",
+        "expiration_date",
+        "domain_status",
         "registry_domain_id",
         "registrant",
         "admin_c",

netbox_dns/forms/zone_template.py

@@ -127,11 +127,13 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     soa_mname_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("MName"),
     )
     soa_rname = forms.CharField(
@@ -141,6 +143,7 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     record_template_id = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Record Templates"),
     )
     description = forms.CharField(
@@ -149,31 +152,37 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     dnssec_policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("DNSSEC Policy ID"),
     )
     registrar_id = DynamicModelMultipleChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrar"),
     )
     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(ZoneTemplate)

netbox_dns/graphql/types.py

@@ -90,6 +90,7 @@ class NetBoxDNSZoneType(NetBoxObjectType):
         | None
     )
     inline_signing: bool
+    parental_agents: List[str]
     registrar: (
         Annotated["NetBoxDNSRegistrarType", strawberry.lazy("netbox_dns.graphql.types")]
         | None

netbox_dns/migrations/0018_zone_domain_status_zone_expiration_date.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.7 on 2025-04-03 13:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0017_dnssec_policy_zone_zone_template"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zone",
+            name="domain_status",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name="zone",
+            name="expiration_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

netbox_dns/migrations/0019_dnssecpolicy_parental_agents.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2 on 2025-04-22 18:05
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0018_zone_domain_status_zone_expiration_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dnssecpolicy",
+            name="parental_agents",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.GenericIPAddressField(),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]