netbox-plugin-dns 1.3.6__tar.gz → 1.4.0__tar.gz

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.3.6
+Version: 1.4.0
 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.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/__init__.py

@@ -4,7 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
 from netbox.plugins import PluginConfig
 from netbox.plugins.utils import get_plugin_config
 
-__version__ = "1.3.6"
+__version__ = "1.4.0"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/api/serializers_/zone_template.py

@@ -30,6 +30,7 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
             "soa_mname",
             "soa_rname",
             "dnssec_policy",
+            "parental_agents",
             "registrar",
             "registrant",
             "tech_c",

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/filtersets/zone_template.py

@@ -1,3 +1,6 @@
+import netaddr
+from netaddr.core import AddrFormatError
+
 import django_filters
 
 from django.db.models import Q
@@ -5,6 +8,7 @@ from django.utils.translation import gettext as _
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
+from utilities.filters import MultiValueCharFilter
 
 from netbox_dns.models import (
     ZoneTemplate,
@@ -76,6 +80,10 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("DNSSEC Policy"),
     )
+    parental_agents = MultiValueCharFilter(
+        method="filter_parental_agents",
+        label=_("Parental Agents"),
+    )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
         label=_("Registrar ID"),
@@ -127,6 +135,19 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("Billing Contact"),
     )
 
+    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_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/forms/dnssec_key_template.py

@@ -15,7 +15,8 @@ from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
-from utilities.forms import add_blank_choice
+from utilities.forms.widgets import HTMXSelect
+from utilities.forms import add_blank_choice, get_field_value
 from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
@@ -52,6 +53,10 @@ class DNSSECKeyTemplateForm(TenancyForm, NetBoxModelForm):
             "tags",
         )
 
+        widgets = {
+            "algorithm": HTMXSelect(),
+        }
+
     fieldsets = (
         FieldSet(
             "name",
@@ -76,6 +81,13 @@ class DNSSECKeyTemplateForm(TenancyForm, NetBoxModelForm):
         ),
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        algorithm = get_field_value(self, "algorithm")
+        if algorithm != DNSSECKeyTemplateAlgorithmChoices.RSASHA256:
+            del self.fields["key_size"]
+
     lifetime = TimePeriodField(
         required=False,
     )

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/forms/zone.py

@@ -21,9 +21,13 @@ from utilities.forms.fields import (
     CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
 )
-from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker
+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
+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
 
@@ -79,9 +83,9 @@ class ZoneTemplateUpdateMixin:
             self.cleaned_data["tags"] = template.tags.all()
 
         for field in template.template_fields:
-            if self.cleaned_data.get(field) in (None, "") and getattr(
+            if self.cleaned_data.get(field) in (None, "", []) and getattr(
                 template, field
-            ) not in (None, ""):
+            ) not in (None, "", []):
                 self.cleaned_data[field] = getattr(template, field)
 
         self._check_soa_mname()
@@ -207,6 +211,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         }
 
         widgets = {
+            "dnssec_policy": HTMXSelect(),
+            "registrar": HTMXSelect(),
             "expiration_date": DatePicker,
         }
 
@@ -310,6 +316,15 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
                     name__in=default_nameservers
                 )
 
+        if not get_field_value(self, "dnssec_policy"):
+            del self.fields["inline_signing"]
+            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,

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/forms/zone_template.py

@@ -1,5 +1,6 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
+from django.contrib.postgres.forms import SimpleArrayField
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -46,6 +47,7 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
             "soa_mname",
             "soa_rname",
             "dnssec_policy",
+            "parental_agents",
             "record_templates",
             "description",
             "registrar",
@@ -80,6 +82,7 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
         ),
         FieldSet(
             "dnssec_policy",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -145,6 +148,7 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         ),
         FieldSet(
             "dnssec_policy",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -197,6 +201,10 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         null_option=_("None"),
         label=_("DNSSEC Policy ID"),
     )
+    parental_agents = forms.GenericIPAddressField(
+        required=False,
+        label=_("Parental Agents"),
+    )
     registrar_id = DynamicModelMultipleChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
@@ -241,6 +249,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
             "soa_rname",
             "record_templates",
             "dnssec_policy",
+            "parental_agents",
             "description",
             "registrar",
             "registrant",
@@ -351,6 +360,7 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         ),
         FieldSet(
             "dnssec_policy",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -411,6 +421,11 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         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,

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/graphql/types.py

@@ -290,6 +290,7 @@ class NetBoxDNSZoneTemplateType(NetBoxObjectType):
         ]
         | None
     )
+    parental_agents: List[str]
     record_templates: List[
         Annotated[
             "NetBoxDNSRecordTemplateType", strawberry.lazy("netbox_dns.graphql.types")

netbox_plugin_dns-1.4.0/netbox_dns/migrations/0024_zonetemplate_parental_agents.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.5 on 2025-09-02 15:40
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0023_disable_ptr_false"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zonetemplate",
+            name="parental_agents",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.GenericIPAddressField(),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/models/dnssec_key_template.py

@@ -91,6 +91,9 @@ class DNSSECKeyTemplate(ContactsMixin, NetBoxModel):
         return DNSSECKeyTemplateTypeChoices.colors.get(self.type)
 
     def clean(self, *args, **kwargs):
+        if self.algorithm != DNSSECKeyTemplateAlgorithmChoices.RSASHA256:
+            self.key_size = self._meta.get_field("key_size").get_default()
+
         super().clean(*args, **kwargs)
 
         validate_key_template(self)

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/models/zone.py

@@ -650,7 +650,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             expiration_error = _("The registration for this domain has expired.")
         elif (self.expiration_date - date.today()).days < expiration_warning_days:
             expiration_warning = _(
-                f"The registration for his domain will expire less than {expiration_warning_days} days."
+                f"The registration for this domain will expire in less than {expiration_warning_days} days."
             )
 
         return expiration_warning, expiration_error
@@ -800,6 +800,17 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         super().clean_fields(exclude=exclude)
 
     def clean(self, *args, **kwargs):
+        if not self.dnssec_policy:
+            self.inline_signing = self._meta.get_field("inline_signing").get_default()
+            self.parental_agents = self._meta.get_field("parental_agents").get_default()
+
+        if not self.registrar:
+            self.registry_domain_id = self._meta.get_field(
+                "registry_domain_id"
+            ).get_default()
+            self.expiration_date = self._meta.get_field("expiration_date").get_default()
+            self.domain_status = self._meta.get_field("domain_status").get_default()
+
         if self.soa_ttl is None:
             self.soa_ttl = self.default_ttl
 

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/models/zone_template.py

@@ -4,6 +4,7 @@ from dns.exception import DNSException
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ValidationError
+from django.contrib.postgres.fields import ArrayField
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
@@ -31,6 +32,7 @@ class ZoneTemplate(NetBoxModel):
         "soa_mname",
         "soa_rname",
         "dnssec_policy",
+        "parental_agents",
         "registrar",
         "registrant",
         "admin_c",
@@ -43,6 +45,7 @@ class ZoneTemplate(NetBoxModel):
         "soa_mname",
         "soa_rname",
         "dnssec_policy",
+        "parental_agents",
         "registrar",
         "registrant",
         "admin_c",
@@ -98,6 +101,14 @@ class ZoneTemplate(NetBoxModel):
         blank=True,
         null=True,
     )
+    parental_agents = ArrayField(
+        base_field=models.GenericIPAddressField(
+            protocol="both",
+        ),
+        blank=True,
+        null=True,
+        default=list,
+    )
     registrar = models.ForeignKey(
         verbose_name=_("Registrar"),
         to="Registrar",

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_dns/templates/netbox_dns/zonetemplate.html

@@ -61,6 +61,16 @@
                         <th scope="row">{% trans "Policy" %}</th>
                         <td>{{ object.dnssec_policy|linkify }}</td>
                     </tr>
+                    <tr>
+                        <th scope="row">{% trans "Parental Agents" %}</th>
+                        <td>
+                            <table>
+                                {% for parental_agent in object.parental_agents %}
+                                <tr><td>{{ parental_agent }}</td></tr>
+                                {% endfor %}
+                            </table>
+                        </td>
+                    </tr>
                 </table>
             </div>
         {% endif %}

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.3.6
+Version: 1.4.0
 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.3.6 → netbox_plugin_dns-1.4.0}/netbox_plugin_dns.egg-info/SOURCES.txt

@@ -110,6 +110,7 @@ netbox_dns/migrations/0022_search.py
 netbox_dns/migrations/0023_alter_record_value.py
 netbox_dns/migrations/0023_disable_ptr_false.py
 netbox_dns/migrations/0024_tenancy.py
+netbox_dns/migrations/0024_zonetemplate_parental_agents.py
 netbox_dns/migrations/0025_ipam_coupling_cf.py
 netbox_dns/migrations/0026_domain_registration.py
 netbox_dns/migrations/0027_alter_registrar_iana_id.py

{netbox_plugin_dns-1.3.6 → netbox_plugin_dns-1.4.0}/pyproject.toml

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