netbox-plugin-dns 1.4.2__tar.gz → 1.4.3__tar.gz

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.4.2
+Version: 1.4.3
 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.4.2 → netbox_plugin_dns-1.4.3}/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.4.2"
+__version__ = "1.4.3"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/api/serializers_/zone.py

@@ -61,6 +61,7 @@ class ZoneSerializer(NetBoxModelSerializer):
             "tech_c",
             "admin_c",
             "billing_c",
+            "comments",
             "active",
             "custom_fields",
             "tenant",

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/filtersets/zone.py

@@ -248,5 +248,6 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             | Q(admin_c__name__icontains=value)
             | Q(tech_c__name__icontains=value)
             | Q(billing_c__name__icontains=value)
+            | Q(comments__icontains=value)
         )
         return queryset.filter(qs_filter)

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/forms/dnssec_policy.py

@@ -113,6 +113,14 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         ),
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if not self.initial.get("use_nsec3"):
+            self.initial["nsec3_iterations"] = None
+            self.initial["nsec3_opt_out"] = None
+            self.initial["nsec3_salt_size"] = None
+
     key_templates = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
@@ -180,6 +188,21 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         label=_("Parent Propagation Delay"),
         placeholder=DNSSECPolicy.get_fallback_setting("parent_propagation_delay"),
     )
+    nsec3_opt_out = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("NSEC3 Opt-Out"),
+    )
+
+    def clean(self, *args, **kwargs):
+        super().clean(*args, **kwargs)
+
+        if not self.cleaned_data.get("use_nsec3"):
+            self.cleaned_data["nsec3_iterations"] = None
+            self.cleaned_data["nsec3_opt_out"] = None
+            self.cleaned_data["nsec3_salt_size"] = None
+
+        return self.cleaned_data
 
 
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/forms/zone.py

@@ -20,6 +20,7 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     CSVModelMultipleChoiceField,
     DynamicModelChoiceField,
+    CommentField,
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect
 from utilities.forms.rendering import FieldSet
@@ -194,6 +195,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "billing_c",
             "tenant_group",
             "tenant",
+            "comments",
             "tags",
         )
 
@@ -412,6 +414,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         label=_("RFC2317 Prefix"),
     )
 
+    comments = CommentField()
+
     def clean_default_ttl(self):
         return (
             self.cleaned_data["default_ttl"]
@@ -641,6 +645,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "tech_c",
             "billing_c",
             "tenant",
+            "comments",
             "tags",
         )
 
@@ -891,6 +896,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "tech_c",
         "billing_c",
         "tenant",
+        "comments",
     )
 
     view = DynamicModelChoiceField(
@@ -1035,3 +1041,4 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Tenant"),
     )
+    comments = CommentField()

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/graphql/filters/zone.py

@@ -141,5 +141,7 @@ class NetBoxDNSZoneFilter(
     rfc2317_parent_zone_id: ID | None = strawberry_django.filter_field()
     rfc2317_parent_managed: FilterLookup[bool] | None = strawberry_django.filter_field()
 
+    comments: FilterLookup[str] | None = strawberry_django.filter_field()
+
     arpa_network: FilterLookup[str] | None = strawberry_django.filter_field()
     active: FilterLookup[bool] | None = strawberry_django.filter_field()

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/graphql/types.py

@@ -136,6 +136,9 @@ class NetBoxDNSZoneType(NetBoxObjectType):
     rfc2317_child_zones: List[
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
     ]
+
+    comments: str | None
+
     arpa_network: str | None
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
 
@@ -217,7 +220,7 @@ class NetBoxDNSDNSSECPolicyType(NetBoxObjectType):
     parent_propagation_delay: BigInt | None
     use_nsec3: bool
     nsec3_iterations: BigInt | None
-    nsec3_opt_out: bool
+    nsec3_opt_out: bool | None
     nsec3_salt_size: BigInt | None
 
 

netbox_plugin_dns-1.4.3/netbox_dns/migrations/0026_alter_dnssecpolicy_nsec3_opt_out.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.6 on 2025-10-08 14:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0025_remove_zone_inline_signing_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dnssecpolicy",
+            name="nsec3_opt_out",
+            field=models.BooleanField(blank=True, null=True),
+        ),
+    ]

netbox_plugin_dns-1.4.3/netbox_dns/migrations/0027_zone_comments.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-24 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0026_alter_dnssecpolicy_nsec3_opt_out"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="zone",
+            name="comments",
+            field=models.TextField(blank=True),
+        ),
+    ]

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/models/dnssec_policy.py

@@ -150,9 +150,8 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
     )
     nsec3_opt_out = models.BooleanField(
         verbose_name=_("NSEC3 Opt-Out"),
-        blank=False,
-        null=False,
-        default=False,
+        blank=True,
+        null=True,
     )
     nsec3_salt_size = models.PositiveIntegerField(
         verbose_name=_("NSEC3 Salt Size"),

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/models/zone.py

@@ -135,6 +135,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "billing_c",
         "rfc2317_parent_managed",
         "tenant",
+        "comments",
     }
 
     objects = ZoneManager()
@@ -362,6 +363,10 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
+    comments = models.TextField(
+        verbose_name=_("Comments"),
+        blank=True,
+    )
 
     @property
     def fqdn(self):

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/tables/dnssec_policy.py

@@ -7,6 +7,7 @@ from netbox.tables import (
     TagColumn,
     ChoiceFieldColumn,
     ActionsColumn,
+    BooleanColumn,
 )
 from tenancy.tables import TenancyColumnsMixin
 
@@ -77,7 +78,7 @@ class DNSSECPolicyTable(TenancyColumnsMixin, NetBoxTable):
     zone_propagation_delay = tables.Column(
         verbose_name=_("Zone Propagation Delay"),
     )
-    create_cdnskey = tables.BooleanColumn(
+    create_cdnskey = BooleanColumn(
         verbose_name=_("Create CDNSKEY"),
     )
     cds_digest_types = tables.Column(
@@ -89,13 +90,13 @@ class DNSSECPolicyTable(TenancyColumnsMixin, NetBoxTable):
     parent_propagation_delay = tables.Column(
         verbose_name=_("Parent Propagation Delay"),
     )
-    use_nsec3 = tables.BooleanColumn(
+    use_nsec3 = BooleanColumn(
         verbose_name=_("Use NSEC3"),
     )
     nsec3_iterations = tables.Column(
         verbose_name=_("NSEC3 Iterations"),
     )
-    nsec3_opt_out = tables.BooleanColumn(
+    nsec3_opt_out = BooleanColumn(
         verbose_name=_("NSEC3 Opt Out"),
     )
     nsec3_salt_size = tables.Column(
@@ -126,10 +127,10 @@ class DNSSECPolicyDisplayTable(TenancyColumnsMixin, NetBoxTable):
     status = ChoiceFieldColumn(
         verbose_name=_("Status"),
     )
-    create_cdnskey = tables.BooleanColumn(
+    create_cdnskey = BooleanColumn(
         verbose_name=_("Create CDNSKEY"),
     )
-    use_nsec3 = tables.BooleanColumn(
+    use_nsec3 = BooleanColumn(
         verbose_name=_("Use NSEC3"),
     )
     tags = TagColumn(

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/tables/record.py

@@ -8,6 +8,8 @@ from netbox.tables import (
     ChoiceFieldColumn,
     TagColumn,
     ActionsColumn,
+    BooleanColumn,
+    TemplateColumn,
 )
 from tenancy.tables import TenancyColumnsMixin
 
@@ -44,11 +46,11 @@ class RecordBaseTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name=_("FQDN"),
         linkify=True,
     )
-    value = tables.TemplateColumn(
+    value = TemplateColumn(
         verbose_name=_("Value"),
         template_code="{{ value|truncatechars:64 }}",
     )
-    unicode_value = tables.TemplateColumn(
+    unicode_value = TemplateColumn(
         verbose_name=_("Unicode Value"),
         template_code="{{ value|truncatechars:64 }}",
         accessor="value",
@@ -56,7 +58,7 @@ class RecordBaseTable(TenancyColumnsMixin, NetBoxTable):
     ttl = tables.Column(
         verbose_name=_("TTL"),
     )
-    active = tables.BooleanColumn(
+    active = BooleanColumn(
         verbose_name=_("Active"),
     )
 
@@ -89,7 +91,7 @@ class RecordTable(RecordBaseTable):
     status = ChoiceFieldColumn(
         verbose_name=_("Status"),
     )
-    disable_ptr = tables.BooleanColumn(
+    disable_ptr = BooleanColumn(
         verbose_name=_("Disable PTR"),
     )
     tags = TagColumn(

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/tables/record_template.py

@@ -1,7 +1,13 @@
 import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
 
-from netbox.tables import NetBoxTable, TagColumn, ActionsColumn
+from netbox.tables import (
+    ActionsColumn,
+    BooleanColumn,
+    NetBoxTable,
+    TagColumn,
+    TemplateColumn,
+)
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import RecordTemplate
@@ -42,11 +48,11 @@ class RecordTemplateTable(TenancyColumnsMixin, NetBoxTable):
     type = tables.Column(
         verbose_name=_("Type"),
     )
-    value = tables.TemplateColumn(
+    value = TemplateColumn(
         verbose_name=_("Value"),
         template_code="{{ value|truncatechars:64 }}",
     )
-    unicode_value = tables.TemplateColumn(
+    unicode_value = TemplateColumn(
         verbose_name=_("Unicode Value"),
         template_code="{{ value|truncatechars:64 }}",
         accessor="value",
@@ -54,7 +60,7 @@ class RecordTemplateTable(TenancyColumnsMixin, NetBoxTable):
     ttl = tables.Column(
         verbose_name=_("TTL"),
     )
-    disable_ptr = tables.BooleanColumn(
+    disable_ptr = BooleanColumn(
         verbose_name=_("Disable PTR"),
     )
     tags = TagColumn(

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/tables/view.py

@@ -1,7 +1,7 @@
 import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
 
-from netbox.tables import NetBoxTable, TagColumn, ActionsColumn
+from netbox.tables import ActionsColumn, BooleanColumn, NetBoxTable, TagColumn
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import View
@@ -31,7 +31,7 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name=_("Name"),
         linkify=True,
     )
-    default_view = tables.BooleanColumn(
+    default_view = BooleanColumn(
         verbose_name=_("Default View"),
     )
     tags = TagColumn(url_name="plugins:netbox_dns:view_list")

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/tables/zone.py

@@ -6,6 +6,7 @@ from netbox.tables import (
     NetBoxTable,
     TagColumn,
     ActionsColumn,
+    columns,
 )
 from tenancy.tables import TenancyColumnsMixin
 
@@ -30,6 +31,7 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
             "registry_domain_id",
             "expiration_date",
             "domain_status",
+            "comments",
         )
 
         default_columns = (
@@ -94,6 +96,7 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name=_("Billing Contact"),
         linkify=True,
     )
+    comments = columns.MarkdownColumn()
 
     def render_name(self, value, record):
         return record.display_name

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/template_content.py

@@ -48,8 +48,18 @@ class RelatedDNSRecords(PluginTemplateExtension):
         return self.render(
             "netbox_dns/record/related.html",
             extra_context={
-                "related_address_records": address_record_table,
-                "related_pointer_records": pointer_record_table,
+                "address_card_title": (
+                    _("Synchronized Address Records")
+                    if len(address_records) > 1
+                    else _("Synchronized Address Record")
+                ),
+                "address_record_table": address_record_table,
+                "pointer_card_title": (
+                    _("Synchronized Pointer Records")
+                    if len(pointer_records) > 1
+                    else _("Synchronized Pointer Record")
+                ),
+                "pointer_record_table": pointer_record_table,
             },
         )
 
@@ -99,11 +109,11 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
         address_records = Record.objects.filter(
             type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
             ip_address=ip_address.address.ip,
-        )
+        ).exclude(ipam_ip_address=ip_address)
         pointer_records = Record.objects.filter(
             type=RecordTypeChoices.PTR,
             ip_address=ip_address.address.ip,
-        )
+        ).exclude(address_records__ipam_ip_address__in=[ip_address])
 
         if address_records:
             address_record_table = RelatedRecordTable(
@@ -124,8 +134,18 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
         return self.render(
             "netbox_dns/record/related.html",
             extra_context={
-                "related_address_records": address_record_table,
-                "related_pointer_records": pointer_record_table,
+                "address_card_title": (
+                    _("Related Address Records")
+                    if len(address_records) > 1
+                    else _("Related Address Record")
+                ),
+                "address_record_table": address_record_table,
+                "pointer_card_title": (
+                    _("Related Pointer Records")
+                    if len(pointer_records) > 1
+                    else _("Related Pointer Record")
+                ),
+                "pointer_record_table": pointer_record_table,
             },
         )
 

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/templates/netbox_dns/dnssecpolicy.html

@@ -138,7 +138,11 @@
                         </tr>
                         <tr>
                             <th scope="row">{% trans "NSEC3 Opt Out" %}</th>
-                            <td>{% checkmark object.nsec3_opt_out %}</td>
+                            {% if object.nsec3_opt_out is None %}
+                                <td>{{ ''|placeholder }}</td>
+                            {% else %}
+                                <td>{% checkmark object.nsec3_opt_out %}</td>
+                            {% endif %}
                         </tr>
                         <tr>
                             <th scope="row">{% trans "NSEC3 Salt Size" %}</th>

netbox_plugin_dns-1.4.3/netbox_dns/templates/netbox_dns/record/related.html

@@ -0,0 +1,21 @@
+{% load render_table from django_tables2 %}
+{% load perms %}
+
+{% if perms.netbox_dns.view_record %}
+    {% if address_record_table %}
+        <div class="card">
+            <h2 class="card-header">{{ address_card_title }}</h2>
+            <div class="table-responsive">
+                {% render_table address_record_table 'inc/table.html' %}
+            </div>
+        </div>
+    {% endif %}
+    {% if pointer_record_table %}
+        <div class="card">
+            <h2 class="card-header">{{ pointer_card_title }}</h2>
+            <div class="table-responsive">
+                {% render_table pointer_record_table 'inc/table.html' %}
+            </div>
+        </div>
+    {% endif %}
+{% endif %}

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_dns/templates/netbox_dns/zone.html

@@ -118,6 +118,7 @@
             </div>
         {% endif %}
 
+        {% include 'inc/panels/comments.html' %}
         {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/custom_fields.html' %}
     </div>

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/netbox_plugin_dns.egg-info/PKG-INFO

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

@@ -113,8 +113,10 @@ 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/0025_remove_zone_inline_signing_and_more.py
+netbox_dns/migrations/0026_alter_dnssecpolicy_nsec3_opt_out.py
 netbox_dns/migrations/0026_domain_registration.py
 netbox_dns/migrations/0027_alter_registrar_iana_id.py
+netbox_dns/migrations/0027_zone_comments.py
 netbox_dns/migrations/0028_rfc2317_fields.py
 netbox_dns/migrations/0029_record_fqdn.py
 netbox_dns/migrations/__init__.py

{netbox_plugin_dns-1.4.2 → netbox_plugin_dns-1.4.3}/pyproject.toml

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

netbox_plugin_dns-1.4.2/netbox_dns/templates/netbox_dns/record/related.html

@@ -1,30 +0,0 @@
-{% load render_table from django_tables2 %}
-{% load perms %}
-{% load i18n %}
-
-{% if perms.netbox_dns.view_record %}
-    {% if related_address_records %}
-        <div class="card">
-            {% if related_address_records.rows|length == 1 %}
-                <h2 class="card-header">{% trans "Related DNS Address Record" %}</h2>
-            {% else %}
-                <h2 class="card-header">{% trans "Related DNS Address Records" %}</h2>
-            {% endif %}
-            <div class="table-responsive">
-                {% render_table related_address_records 'inc/table.html' %}
-            </div>
-        </div>
-    {% endif %}
-    {% if related_pointer_records %}
-        <div class="card">
-            {% if related_pointer_records.rows|length == 1 %}
-                <h2 class="card-header">{% trans "Related DNS Pointer Record" %}</h2>
-            {% else %}
-                <h2 class="card-header">{% trans "Related DNS Pointer Records" %}</h2>
-            {% endif %}
-            <div class="table-responsive">
-                {% render_table related_pointer_records 'inc/table.html' %}
-            </div>
-        </div>
-    {% endif %}
-{% endif %}