Merge pull request #609 from peteeckel/fix/move-parental-agents-to-zone

peteeckel · web-flow · commit b7e744ea274d · 2025-04-23T00:18:46.000+02:00
Moved the parental_agents field from DNSSECPolicy to Zone
diff --git a/netbox_dns/api/serializers_/dnssec_policy.py b/netbox_dns/api/serializers_/dnssec_policy.py
@@ -81,7 +81,6 @@ class Meta:
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
diff --git a/netbox_dns/api/serializers_/zone.py b/netbox_dns/api/serializers_/zone.py
@@ -190,6 +190,7 @@ class Meta:
             "rfc2317_child_zones",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "registrar",
             "registry_domain_id",
             "expiration_date",
diff --git a/netbox_dns/filtersets/dnssec_policy.py b/netbox_dns/filtersets/dnssec_policy.py
@@ -1,6 +1,3 @@
-import netaddr
-from netaddr.core import AddrFormatError
-
 import django_filters
 
 from django.db.models import Q
@@ -38,7 +35,6 @@ class Meta:
             "create_cdnskey",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
@@ -88,30 +84,13 @@ class Meta:
         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:
             return queryset
 
         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
diff --git a/netbox_dns/filtersets/zone.py b/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
@@ -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"),
@@ -167,6 +172,19 @@ class Meta:
             "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
diff --git a/netbox_dns/forms/dnssec_policy.py b/netbox_dns/forms/dnssec_policy.py
@@ -1,7 +1,6 @@
 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 (
@@ -66,7 +65,6 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(
@@ -147,11 +145,6 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         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
@@ -174,7 +167,6 @@ class Meta:
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
@@ -219,7 +211,6 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(
@@ -320,10 +311,6 @@ 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),
@@ -427,7 +414,6 @@ class Meta:
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
@@ -508,11 +494,6 @@ 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(),
@@ -566,7 +547,6 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
-            "parental_agents",
             name=_("Parent Delegation"),
         ),
         FieldSet(
diff --git a/netbox_dns/forms/zone.py b/netbox_dns/forms/zone.py
@@ -5,6 +5,7 @@
 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 (
@@ -242,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],
@@ -282,6 +289,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         FieldSet(
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -386,6 +394,7 @@ class Meta:
             "rfc2317_parent_managed",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "registrar",
             "registry_domain_id",
             "expiration_date",
@@ -425,6 +434,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         FieldSet(
             "dnssec_policy_id",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
@@ -517,6 +527,10 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         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,
@@ -756,6 +770,7 @@ class Meta:
             "soa_minimum",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "rfc2317_prefix",
             "rfc2317_parent_managed",
             "registrar",
@@ -886,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,
@@ -962,6 +982,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             name=_("DNSSEC"),
         ),
         FieldSet(
diff --git a/netbox_dns/graphql/types.py b/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
@@ -214,7 +215,6 @@ class NetBoxDNSDNSSECPolicyType(NetBoxObjectType):
     cds_digest_types: List[str]
     parent_ds_ttl: BigInt | None
     parent_propagation_delay: BigInt | None
-    parental_agents: List[str]
     use_nsec3: bool
     nsec3_iterations: BigInt | None
     nsec3_opt_out: bool
diff --git a/netbox_dns/migrations/0020_remove_dnssecpolicy_parental_agents_and_more.py b/netbox_dns/migrations/0020_remove_dnssecpolicy_parental_agents_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.1.8 on 2025-04-22 21:45
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0019_dnssecpolicy_parental_agents"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="dnssecpolicy",
+            name="parental_agents",
+        ),
+        migrations.AddField(
+            model_name="zone",
+            name="parental_agents",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.GenericIPAddressField(),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]
diff --git a/netbox_dns/models/dnssec_policy.py b/netbox_dns/models/dnssec_policy.py
@@ -1,6 +1,5 @@
 from django.db import models
 from django.urls import reverse
-from django.contrib.postgres.fields import ArrayField
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -118,14 +117,6 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         blank=True,
         null=True,
     )
-    parental_agents = ArrayField(
-        base_field=models.GenericIPAddressField(
-            protocol="both",
-        ),
-        blank=True,
-        null=True,
-        default=list,
-    )
 
     use_nsec3 = models.BooleanField(
         verbose_name=_("Use NSEC3"),
diff --git a/netbox_dns/models/zone.py b/netbox_dns/models/zone.py
@@ -17,6 +17,7 @@
 from django.urls import reverse
 from django.dispatch import receiver
 from django.conf import settings
+from django.contrib.postgres.fields import ArrayField
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -193,6 +194,14 @@ def __init__(self, *args, **kwargs):
         help_text=_("Use inline signing for DNSSEC"),
         default=True,
     )
+    parental_agents = ArrayField(
+        base_field=models.GenericIPAddressField(
+            protocol="both",
+        ),
+        blank=True,
+        null=True,
+        default=list,
+    )
     registrar = models.ForeignKey(
         verbose_name=_("Registrar"),
         to="Registrar",
diff --git a/netbox_dns/templates/netbox_dns/dnssecpolicy.html b/netbox_dns/templates/netbox_dns/dnssecpolicy.html
@@ -118,16 +118,6 @@ <h5 class="card-header">{% trans "Parent Delegation" %}</h5>
                         <th scope="row">{% trans "Parent Propagation Delay" %}</th>
                         <td>{{ object.parent_propagation_delay|placeholder }}</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>
             <div class="card">
diff --git a/netbox_dns/templates/netbox_dns/zone.html b/netbox_dns/templates/netbox_dns/zone.html
@@ -108,6 +108,16 @@ <h5 class="card-header">{% trans "DNSSEC" %}</h5>
                         <th scope="row">{% trans "Use Inline Signing" %}</th>
                         <td>{% checkmark object.inline_signing %}</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 %}
diff --git a/netbox_dns/tests/dnssec_policy/test_api.py b/netbox_dns/tests/dnssec_policy/test_api.py
diff --git a/netbox_dns/tests/dnssec_policy/test_filtersets.py b/netbox_dns/tests/dnssec_policy/test_filtersets.py
diff --git a/netbox_dns/tests/dnssec_policy/test_views.py b/netbox_dns/tests/dnssec_policy/test_views.py
diff --git a/netbox_dns/tests/zone/test_filtersets.py b/netbox_dns/tests/zone/test_filtersets.py
