netbox-plugin-dns 1.2.7b2__tar.gz → 1.2.7b3__tar.gz

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.7b2
+Version: 1.2.7b3
 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

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/__init__.py

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

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/api/nested_serializers.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 
 from netbox.api.serializers import WritableNestedSerializer
 
-from netbox_dns.models import Zone, Record, ZoneTemplate, RecordTemplate
+from netbox_dns.models import Zone, Record, ZoneTemplate, RecordTemplate, DNSSECPolicy
 from netbox_dns.api.serializers_.view import ViewSerializer
 
 
@@ -12,6 +12,7 @@ __all__ = (
     "NestedRecordSerializer",
     "NestedZoneTemplateSerializer",
     "NestedRecordTemplateSerializer",
+    "NestedDNSSECPolicySerializer",
 )
 
 
@@ -127,3 +128,20 @@ class NestedRecordTemplateSerializer(WritableNestedSerializer):
             "ttl",
             "description",
         )
+
+
+class NestedDNSSECPolicySerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:netbox_dns-api:dnssecpolicy-detail"
+    )
+
+    class Meta:
+        model = DNSSECPolicy
+        fields = (
+            "id",
+            "url",
+            "display",
+            "name",
+            "description",
+            "status",
+        )

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/api/serializers_/dnssec_key_template.py

@@ -1,3 +1,4 @@
+from django.utils.translation import gettext as _
 from rest_framework import serializers
 
 from netbox.api.serializers import NetBoxModelSerializer
@@ -5,6 +6,8 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 
 from netbox_dns.models import DNSSECKeyTemplate
 
+from ..nested_serializers import NestedDNSSECPolicySerializer
+
 
 __all__ = ("DNSSECKeyTemplateSerializer",)
 
@@ -13,6 +16,13 @@ class DNSSECKeyTemplateSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:dnsseckeytemplate-detail"
     )
+    policies = NestedDNSSECPolicySerializer(
+        many=True,
+        read_only=True,
+        required=False,
+        default=None,
+        help_text=_("Policies using this Key Template"),
+    )
     tenant = TenantSerializer(required=False, allow_null=True)
 
     class Meta:
@@ -23,6 +33,7 @@ class DNSSECKeyTemplateSerializer(NetBoxModelSerializer):
             "display",
             "name",
             "description",
+            "policies",
             "tags",
             "type",
             "lifetime",

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/api/serializers_/dnssec_policy.py

@@ -7,6 +7,7 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 from netbox_dns.models import DNSSECPolicy
 
 from .dnssec_key_template import DNSSECKeyTemplateSerializer
+from ..nested_serializers import NestedZoneSerializer, NestedZoneTemplateSerializer
 
 
 __all__ = ("DNSSECPolicySerializer",)
@@ -24,6 +25,20 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Key templates assigned to the policy"),
     )
+    zones = NestedZoneSerializer(
+        many=True,
+        read_only=True,
+        required=False,
+        default=None,
+        help_text=_("Zones this policy is assigned to"),
+    )
+    zone_templates = NestedZoneTemplateSerializer(
+        many=True,
+        read_only=True,
+        required=False,
+        default=None,
+        help_text=_("Zone templates this policy is assigned to"),
+    )
     tenant = TenantSerializer(required=False, allow_null=True)
 
     class Meta:
@@ -37,6 +52,8 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
             "status",
             "tags",
             "key_templates",
+            "zones",
+            "zone_templates",
             "dnskey_ttl",
             "purge_keys",
             "publish_safety",

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/choices/dnssec_key_template.py

@@ -57,7 +57,7 @@ class DNSSECKeyTemplateKeySizeChoices(ChoiceSet):
 @define_choice_attributes()
 class DNSSECKeyTemplateAlgorithmChoices(ChoiceSet):
     CHOICES = [
-        (algorithm.name, algorithm.name)
-        for algorithm in sorted(Algorithm, key=lambda a: a.name)
+        (algorithm.name, f"{algorithm.name} ({algorithm.value})")
+        for algorithm in sorted(Algorithm, key=lambda a: a.value)
         if algorithm.value < 252 and algorithm not in DEPRECATED_ALGORITHMS
     ]

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/fields/choice_array.py

@@ -1,5 +1,15 @@
 from django import forms
 from django.contrib.postgres.fields import ArrayField
+from django.db.models import Transform, IntegerField
+
+
+class ArrayLength(Transform):
+    lookup_name = "length"
+    function = "cardinality"
+
+    @property
+    def output_field(self):
+        return IntegerField()
 
 
 class _TypedMultipleChoiceField(forms.TypedMultipleChoiceField):
@@ -18,3 +28,6 @@ class ChoiceArrayField(ArrayField):
             coerce=self.base_field.to_python,
             **kwargs,
         )
+
+
+ChoiceArrayField.register_lookup(ArrayLength)

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/fields/timeperiod.py

@@ -1,4 +1,4 @@
-from django.forms import Field
+from django.forms import Field, TextInput
 from django.utils.dateparse import parse_duration
 from django.core.exceptions import ValidationError
 
@@ -7,6 +7,14 @@ __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

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/filtersets/dnssec_key_template.py

@@ -27,13 +27,13 @@ class DNSSECKeyTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         choices=DNSSECKeyTemplateKeySizeChoices,
     )
 
-    policy_id = django_filters.ModelMultipleChoiceFilter(
+    policies_id = django_filters.ModelMultipleChoiceFilter(
         field_name="policies",
         queryset=DNSSECPolicy.objects.all(),
         to_field_name="id",
         label=_("DNSSEC Policy IDs"),
     )
-    policy = django_filters.ModelMultipleChoiceFilter(
+    policies = django_filters.ModelMultipleChoiceFilter(
         field_name="policies__name",
         queryset=DNSSECPolicy.objects.all(),
         to_field_name="name",

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/filtersets/dnssec_policy.py

@@ -7,7 +7,7 @@ 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",)
@@ -47,18 +47,42 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         method="filter_cds_digest_types",
         label=_("CDS Digest Types"),
     )
-    key_template = django_filters.ModelMultipleChoiceFilter(
+    key_templates = django_filters.ModelMultipleChoiceFilter(
         field_name="key_templates__name",
         queryset=DNSSECKeyTemplate.objects.all(),
         to_field_name="name",
         label=_("DNSSEC Key Templates"),
     )
-    key_template_id = django_filters.ModelMultipleChoiceFilter(
+    key_templates_id = django_filters.ModelMultipleChoiceFilter(
         field_name="key_templates",
         queryset=DNSSECKeyTemplate.objects.all(),
         to_field_name="id",
         label=_("DNSSEC Key Template IDs"),
     )
+    zones = django_filters.ModelMultipleChoiceFilter(
+        field_name="zones__name",
+        queryset=Zone.objects.all(),
+        to_field_name="name",
+        label=_("Zones"),
+    )
+    zones_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="zones",
+        queryset=Zone.objects.all(),
+        to_field_name="id",
+        label=_("Zone IDs"),
+    )
+    zone_templates = django_filters.ModelMultipleChoiceFilter(
+        field_name="zone_templates__name",
+        queryset=ZoneTemplate.objects.all(),
+        to_field_name="name",
+        label=_("Zone Templates"),
+    )
+    zone_templates_id = django_filters.ModelMultipleChoiceFilter(
+        field_name="zone_templates",
+        queryset=ZoneTemplate.objects.all(),
+        to_field_name="id",
+        label=_("Zone Template IDs"),
+    )
 
     def filter_cds_digest_types(self, queryset, name, value):
         if not value:

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/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("policies_id", name=_("Policies")),
         FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
         FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
@@ -79,7 +79,7 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     description = forms.CharField(
         required=False,
     )
-    policy_id = DynamicModelMultipleChoiceField(
+    policies_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
         label=_("Policies"),

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/forms/dnssec_policy.py

@@ -23,7 +23,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
 
@@ -74,7 +74,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")),
     )
 
@@ -119,50 +119,62 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
     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"),
     )
 
 
@@ -174,9 +186,14 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "name",
             "description",
             "status",
-            "key_template_id",
+            "key_templates_id",
             name=_("Attributes"),
         ),
+        FieldSet(
+            "zones_id",
+            "zone_templates_id",
+            name=_("Assignments"),
+        ),
         FieldSet(
             "dnskey_ttl",
             "purge_keys",
@@ -219,11 +236,21 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
-    key_template_id = DynamicModelMultipleChoiceField(
+    key_templates_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
         label=_("Key Templates"),
     )
+    zones_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        label=_("Zones"),
+    )
+    zone_templates_id = DynamicModelMultipleChoiceField(
+        queryset=ZoneTemplate.objects.all(),
+        required=False,
+        label=_("Zone Templates"),
+    )
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/models/dnssec_policy.py

@@ -181,16 +181,18 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         return self.publish_safety if self.publish_safety is not None else 3600
 
     def get_effective_value(self, attribute):
-        default_value = get_plugin_config("netbox_dns", f"dnssec_{attribute}", None)
-
         if not hasattr(self, attribute):
             raise AttributeError(f"DNSSECPolicy does not have attribute {attribute}")
 
         if (value := getattr(self, attribute)) is None:
-            return default_value
+            return self.get_fallback_setting(attribute)
 
         return value
 
+    @classmethod
+    def get_fallback_setting(cls, attribute):
+        return get_plugin_config("netbox_dns", f"dnssec_{attribute}")
+
 
 @register_search
 class DNSSECPolicyIndex(SearchIndex):

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/validators/dnssec.py

@@ -97,8 +97,8 @@ def validate_key_template_lifetime(key_template, policy, raise_exception=True):
     ):
         validation_errors.append(
             _(
-                "Key Lifetime is less than DNSKEY TTL + Publish Safety + Zone Propagation Delay."
-            )
+                "Key Lifetime {lifetime} is less than DNSKEY TTL + Publish Safety + Zone Propagation Delay."
+            ).format(lifetime=key_lifetime)
         )
 
     if (
@@ -109,8 +109,8 @@ def validate_key_template_lifetime(key_template, policy, raise_exception=True):
     ):
         validation_errors.append(
             _(
-                "Key Lifetime is less than Max Zone TTL + Retire Safety + Zone Propagation Delay."
-            )
+                "Key Lifetime {lifetime} is less than Max Zone TTL + Retire Safety + Zone Propagation Delay."
+            ).format(lifetime=key_lifetime)
         )
 
     if key_template.type == DNSSECKeyTemplateTypeChoices.TYPE_ZSK:
@@ -123,8 +123,10 @@ def validate_key_template_lifetime(key_template, policy, raise_exception=True):
             and key_lifetime < signatures_validity - signatures_refresh
         ):
             validation_errors.append(
-                _("Key Lifetime is less than Signatures Validity - Signatures Refresh.")
-            )
+                _(
+                    "Key Lifetime {lifetime} is less than Signatures Validity - Signatures Refresh."
+                )
+            ).format(lifetime=key_lifetime)
     else:
         parent_ds_ttl = policy.get_effective_value("parent_ds_ttl")
         parent_propagation_delay = policy.get_effective_value(
@@ -139,8 +141,8 @@ def validate_key_template_lifetime(key_template, policy, raise_exception=True):
         ):
             validation_errors.append(
                 _(
-                    "Key Lifetime is less than Parent DS TTL + Retire Safety + Parent Propagation Delay."
-                )
+                    "Key Lifetime {lifetime} is less than Parent DS TTL + Retire Safety + Parent Propagation Delay."
+                ).format(lifetime=key_lifetime)
             )
 
     return validation_errors

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_dns/views/dnssec_policy.py

@@ -46,7 +46,9 @@ class DNSSECPolicyListView(generic.ObjectListView):
 
 @register_model_view(DNSSECPolicy)
 class DNSSECPolicyView(generic.ObjectView):
-    queryset = DNSSECPolicy.objects.prefetch_related("key_templates")
+    queryset = DNSSECPolicy.objects.prefetch_related(
+        "key_templates", "zones", "zone_templates"
+    )
 
     def get_extra_context(self, request, instance):
         context = {}

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.7b2
+Version: 1.2.7b3
 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

{netbox_plugin_dns-1.2.7b2 → netbox_plugin_dns-1.2.7b3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2.7-beta2"
+version = "1.2.7-beta3"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},