netbox-plugin-dns 1.2.7b2__py3-none-any.whl → 1.2.8__py3-none-any.whl

netbox_dns/fields/timeperiod.py

@@ -1,28 +1,30 @@
-from django.forms import Field
-from django.utils.dateparse import parse_duration
+from django.forms import Field, TextInput
 from django.core.exceptions import ValidationError
 
+from netbox_dns.utilities import iso8601_to_int
 
 __all__ = ("TimePeriodField",)
 
 
 class TimePeriodField(Field):
+    def __init__(self, *args, **kwargs):
+        placeholder = kwargs.pop("placeholder", None)
+
+        if placeholder is not None:
+            self.widget = TextInput(attrs={"placeholder": placeholder})
+
+        return super().__init__(*args, **kwargs)
+
     def to_python(self, value):
         if not value:
             return None
 
         try:
-            return int(value)
-        except ValueError:
-            try:
-                duration = parse_duration(value)
-                if duration is None:
-                    raise TypeError
-                return int(duration.total_seconds())
-            except TypeError:
-                raise ValidationError(
-                    "Enter a valid integer or ISO 8601 duration (W, M and Y are not supported)"
-                )
+            return iso8601_to_int(value)
+        except TypeError:
+            raise ValidationError(
+                "Enter a valid integer or ISO 8601 duration (W, M and Y are not supported)"
+            )
 
     def validate(self, value):
         super().validate(value)

netbox_dns/filtersets/dnssec_policy.py

@@ -1,3 +1,6 @@
+import netaddr
+from netaddr.core import AddrFormatError
+
 import django_filters
 
 from django.db.models import Q
@@ -7,9 +10,10 @@ from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filters import MultiValueCharFilter
 
-from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate
+from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate, Zone, ZoneTemplate
 from netbox_dns.choices import DNSSECPolicyStatusChoices
 
+
 __all__ = ("DNSSECPolicyFilterSet",)
 
 
@@ -34,6 +38,7 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "create_cdnskey",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
@@ -59,6 +64,34 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="id",
         label=_("DNSSEC Key Template IDs"),
     )
+    zone = django_filters.ModelMultipleChoiceFilter(
+        field_name="zones__name",
+        queryset=Zone.objects.all(),
+        to_field_name="name",
+        label=_("Zones"),
+    )
+    zone_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="zones",
+        queryset=Zone.objects.all(),
+        to_field_name="id",
+        label=_("Zone IDs"),
+    )
+    zone_template = django_filters.ModelMultipleChoiceFilter(
+        field_name="zone_templates__name",
+        queryset=ZoneTemplate.objects.all(),
+        to_field_name="name",
+        label=_("Zone Templates"),
+    )
+    zone_template_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="zone_templates",
+        queryset=ZoneTemplate.objects.all(),
+        to_field_name="id",
+        label=_("Zone Template IDs"),
+    )
+    parental_agents = MultiValueCharFilter(
+        method="filter_parental_agents",
+        label=_("Parental Agents"),
+    )
 
     def filter_cds_digest_types(self, queryset, name, value):
         if not value:
@@ -66,6 +99,19 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
 
         return queryset.filter(cds_digest_types__overlap=value)
 
+    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 search(self, queryset, name, value):
         if not value.strip():
             return queryset

netbox_dns/filtersets/zone.py

@@ -16,7 +16,7 @@ from netbox_dns.models import (
     NameServer,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
 
 
 __all__ = ("ZoneFilterSet",)
@@ -86,7 +86,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 +94,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,6 +164,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "rfc2317_parent_managed",
             "inline_signing",
             "registry_domain_id",
+            "domain_status",
         )
 
     def filter_arpa_network(self, queryset, name, value):

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("policy_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")),
     )
@@ -82,6 +82,7 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Policies"),
     )
     type = forms.MultipleChoiceField(

netbox_dns/forms/dnssec_policy.py

@@ -1,6 +1,7 @@
 from packaging.version import Version
 
 from django import forms
+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 import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
 from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
-from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate
+from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate, Zone, ZoneTemplate
 from netbox_dns.choices import DNSSECPolicyDigestChoices, DNSSECPolicyStatusChoices
 from netbox_dns.fields import TimePeriodField
 
@@ -65,6 +66,7 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(
@@ -74,7 +76,7 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "nsec3_salt_size",
             name=_("Proof of Non-Existence"),
         ),
-        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
         FieldSet("tags", name=_("Tags")),
     )
 
@@ -85,86 +87,103 @@ 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"),
+        placeholder=DNSSECPolicy.get_fallback_setting("dnskey_ttl"),
     )
     purge_keys = TimePeriodField(
         required=False,
         label=_("Purge Keys"),
+        placeholder=DNSSECPolicy.get_fallback_setting("purge_keys"),
     )
     publish_safety = TimePeriodField(
         required=False,
         label=_("Publish Safety"),
+        placeholder=DNSSECPolicy.get_fallback_setting("publish_safety"),
     )
     retire_safety = TimePeriodField(
         required=False,
         label=_("Retire Safety"),
+        placeholder=DNSSECPolicy.get_fallback_setting("retire_safety"),
     )
     signatures_jitter = TimePeriodField(
         required=False,
         label=_("Signatures Jitter"),
+        placeholder=DNSSECPolicy.get_fallback_setting("signatures_jitter"),
     )
     signatures_refresh = TimePeriodField(
         required=False,
         label=_("Signatures Refresh"),
+        placeholder=DNSSECPolicy.get_fallback_setting("signatures_refresh"),
     )
     signatures_validity = TimePeriodField(
         required=False,
         label=_("Signatures Validity"),
+        placeholder=DNSSECPolicy.get_fallback_setting("signatures_validity"),
     )
     signatures_validity_dnskey = TimePeriodField(
         required=False,
         label=_("Signatures Validity (DNSKEY)"),
+        placeholder=DNSSECPolicy.get_fallback_setting("signatures_validity_dnskey"),
     )
     max_zone_ttl = TimePeriodField(
         required=False,
         label=_("Max Zone TTL"),
+        placeholder=DNSSECPolicy.get_fallback_setting("max_zone_ttl"),
     )
     zone_propagation_delay = TimePeriodField(
         required=False,
         label=_("Zone Propagation Delay"),
+        placeholder=DNSSECPolicy.get_fallback_setting("zone_propagation_delay"),
     )
     parent_ds_ttl = TimePeriodField(
         required=False,
         label=_("Parent DS TTL"),
+        placeholder=DNSSECPolicy.get_fallback_setting("parent_ds_ttl"),
     )
     parent_propagation_delay = TimePeriodField(
         required=False,
         label=_("Parent Propagation Delay"),
+        placeholder=DNSSECPolicy.get_fallback_setting("parent_propagation_delay"),
+    )
+    parental_agents = SimpleArrayField(
+        required=False,
+        base_field=forms.GenericIPAddressField(),
+        label=_("Parental Agents"),
     )
 
+    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",
+            "parental_agents",
+            "use_nsec3",
+            "nsec3_iterations",
+            "nsec3_opt_out",
+            "nsec3_salt_size",
+            "tenant_group",
+            "tenant",
+            "tags",
+        )
+
 
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = DNSSECPolicy
@@ -177,6 +196,11 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "key_template_id",
             name=_("Attributes"),
         ),
+        FieldSet(
+            "zone_id",
+            "zone_template_id",
+            name=_("Assignments"),
+        ),
         FieldSet(
             "dnskey_ttl",
             "purge_keys",
@@ -195,6 +219,7 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(
@@ -222,8 +247,21 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     key_template_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Key Templates"),
     )
+    zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Zones"),
+    )
+    zone_template_id = DynamicModelMultipleChoiceField(
+        queryset=ZoneTemplate.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Zone Templates"),
+    )
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),
@@ -282,6 +320,10 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Parent Propagation Delay"),
     )
+    parental_agents = forms.GenericIPAddressField(
+        required=False,
+        label=_("Parental Agent"),
+    )
     use_nsec3 = forms.NullBooleanField(
         required=False,
         widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
@@ -385,6 +427,7 @@ class DNSSECPolicyImportForm(NetBoxModelImportForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
@@ -465,6 +508,11 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Parent Propagation Delay"),
     )
+    parental_agents = SimpleArrayField(
+        required=False,
+        base_field=forms.GenericIPAddressField(),
+        label=_("Parental Agents"),
+    )
     use_nsec3 = forms.NullBooleanField(
         required=False,
         widget=BulkEditNullBooleanSelect(),
@@ -518,6 +566,7 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(

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)