netbox-plugin-dns 1.3b1__py3-none-any.whl → 1.3.1__py3-none-any.whl

netbox_dns/forms/zone_template.py

@@ -1,5 +1,3 @@
-from packaging.version import Version
-
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
@@ -9,7 +7,6 @@ from netbox.forms import (
     NetBoxModelImportForm,
     NetBoxModelForm,
 )
-from utilities.release import load_release_data
 from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
     TagFilterField,
@@ -38,44 +35,8 @@ __all__ = (
     "ZoneTemplateBulkEditForm",
 )
 
-QUICK_ADD = Version(load_release_data().version) >= Version("4.2.5")
-
 
 class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
-    nameservers = DynamicModelMultipleChoiceField(
-        queryset=NameServer.objects.all(),
-        required=False,
-        quick_add=QUICK_ADD,
-    )
-    soa_mname = DynamicModelChoiceField(
-        queryset=NameServer.objects.all(),
-        required=False,
-        label=_("MName"),
-        quick_add=QUICK_ADD,
-    )
-    record_templates = DynamicModelMultipleChoiceField(
-        queryset=RecordTemplate.objects.all(),
-        required=False,
-        quick_add=QUICK_ADD,
-    )
-
-    fieldsets = (
-        FieldSet("name", "description", "nameservers", name=_("Zone Template")),
-        FieldSet("soa_mname", "soa_rname", name=_("SOA")),
-        FieldSet("record_templates", name=_("Record Templates")),
-        FieldSet("dnssec_policy", name=_("DNSSEC")),
-        FieldSet(
-            "registrar",
-            "registrant",
-            "admin_c",
-            "tech_c",
-            "billing_c",
-            name=_("Domain Registration"),
-        ),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-        FieldSet("tags", name=_("Tags")),
-    )
-
     class Meta:
         model = ZoneTemplate
 
@@ -96,19 +57,96 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
             "tenant",
             "tags",
         )
+
         labels = {
             "soa_rname": _("RName"),
         }
 
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            "nameservers",
+            name=_("Zone Template"),
+        ),
+        FieldSet(
+            "soa_mname",
+            "soa_rname",
+            name=_("SOA"),
+        ),
+        FieldSet(
+            "record_templates",
+            name=_("Record Templates"),
+        ),
+        FieldSet(
+            "dnssec_policy",
+            name=_("DNSSEC"),
+        ),
+        FieldSet(
+            "registrar",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            name=_("Domain Registration"),
+        ),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
+    )
+
+    nameservers = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        quick_add=True,
+    )
+    soa_mname = DynamicModelChoiceField(
+        queryset=NameServer.objects.all(),
+        required=False,
+        label=_("MName"),
+        quick_add=True,
+    )
+    record_templates = DynamicModelMultipleChoiceField(
+        queryset=RecordTemplate.objects.all(),
+        required=False,
+        quick_add=True,
+    )
+
 
 class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = ZoneTemplate
+
     fieldsets = (
-        FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "nameserver_id", "description", name=_("Attributes")),
-        FieldSet("soa_mname_id", "soa_rname", name=_("SOA")),
-        FieldSet("record_template_id", name=_("Record Templates")),
-        FieldSet("dnssec_policy", name=_("DNSSEC")),
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
+        FieldSet(
+            "name",
+            "nameserver_id",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "soa_mname_id",
+            "soa_rname",
+            name=_("SOA"),
+        ),
+        FieldSet(
+            "record_template_id",
+            name=_("Record Templates"),
+        ),
+        FieldSet(
+            "dnssec_policy",
+            name=_("DNSSEC"),
+        ),
         FieldSet(
             "registrar_id",
             "registrant_id",
@@ -117,7 +155,11 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "billing_c_id",
             name=_("Registration"),
         ),
-        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
     )
 
     name = forms.CharField(
@@ -189,6 +231,26 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
 
 class ZoneTemplateImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = ZoneTemplate
+
+        fields = (
+            "name",
+            "nameservers",
+            "soa_mname",
+            "soa_rname",
+            "record_templates",
+            "dnssec_policy",
+            "description",
+            "registrar",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            "tenant",
+            "tags",
+        )
+
     nameservers = CSVModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         to_field_name="name",
@@ -268,28 +330,59 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         label=_("Tenant"),
     )
 
-    class Meta:
-        model = ZoneTemplate
 
-        fields = (
-            "name",
+class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
+    model = ZoneTemplate
+
+    fieldsets = (
+        FieldSet(
             "nameservers",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
             "soa_mname",
             "soa_rname",
+            name=_("SOA"),
+        ),
+        FieldSet(
             "record_templates",
+            name=_("Record Templates"),
+        ),
+        FieldSet(
             "dnssec_policy",
-            "description",
+            name=_("DNSSEC"),
+        ),
+        FieldSet(
             "registrar",
             "registrant",
             "admin_c",
             "tech_c",
             "billing_c",
+            name=_("Domain Registration"),
+        ),
+        FieldSet(
+            "tenant_group",
             "tenant",
-            "tags",
-        )
+            name=_("Tenancy"),
+        ),
+    )
 
+    nullable_fields = (
+        "description",
+        "nameservers",
+        "soa_mname",
+        "soa_rname",
+        "record_templates",
+        "dnssec_policy",
+        "registrar",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "tenant",
+    )
 
-class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
@@ -300,7 +393,11 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("MName"),
     )
-    soa_rname = forms.CharField(max_length=255, required=False, label=_("RName"))
+    soa_rname = forms.CharField(
+        max_length=255,
+        required=False,
+        label=_("RName"),
+    )
     record_templates = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
@@ -349,50 +446,3 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Tenant"),
     )
-
-    model = ZoneTemplate
-
-    fieldsets = (
-        FieldSet(
-            "nameservers",
-            "description",
-            name=_("Attributes"),
-        ),
-        FieldSet(
-            "soa_mname",
-            "soa_rname",
-            name=_("SOA"),
-        ),
-        FieldSet(
-            "record_templates",
-            name=_("Record Templates"),
-        ),
-        FieldSet(
-            "dnssec_policy",
-            name=_("DNSSEC"),
-        ),
-        FieldSet(
-            "registrar",
-            "registrant",
-            "admin_c",
-            "tech_c",
-            "billing_c",
-            name=_("Domain Registration"),
-        ),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-    )
-
-    nullable_fields = (
-        "description",
-        "nameservers",
-        "soa_mname",
-        "soa_rname",
-        "record_templates",
-        "dnssec_policy",
-        "registrar",
-        "registrant",
-        "admin_c",
-        "tech_c",
-        "billing_c",
-        "tenant",
-    )

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
@@ -164,10 +165,9 @@ class NetBoxDNSRecordType(NetBoxObjectType):
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
-    address_record: (
+    address_records: List[
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
-        | None
-    )
+    ]
     rfc2317_ptr_records: List[
         Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
     ]

netbox_dns/migrations/0019_dnssecpolicy_parental_agents.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2 on 2025-04-22 18:05
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0018_zone_domain_status_zone_expiration_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dnssecpolicy",
+            name="parental_agents",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.GenericIPAddressField(),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
+        ),
+    ]

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,
+            ),
+        ),
+    ]

netbox_dns/migrations/0021_alter_record_ptr_record.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2 on 2025-05-13 09:16
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0020_remove_dnssecpolicy_parental_agents_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="record",
+            name="ptr_record",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="address_records",
+                to="netbox_dns.record",
+            ),
+        ),
+    ]

netbox_dns/models/dnssec_key_template.py

@@ -20,6 +20,29 @@ __all__ = (
 
 
 class DNSSECKeyTemplate(ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("DNSSEC Key Template")
+        verbose_name_plural = _("DNSSEC Key Templates")
+
+        unique_together = (
+            "name",
+            "type",
+        )
+
+        ordering = ("name",)
+
+    clone_fields = (
+        "description",
+        "type",
+        "lifetime",
+        "algorithm",
+        "key_size",
+        "tenant",
+    )
+
+    def __str__(self):
+        return f"{str(self.name)} [{self.type}]"
+
     name = models.CharField(
         verbose_name=_("Name"),
         max_length=255,
@@ -64,28 +87,6 @@ class DNSSECKeyTemplate(ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "description",
-        "type",
-        "lifetime",
-        "algorithm",
-        "key_size",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("DNSSEC Key Template")
-        verbose_name_plural = _("DNSSEC Key Templates")
-        unique_together = (
-            "name",
-            "type",
-        )
-
-        ordering = ("name",)
-
-    def __str__(self):
-        return f"{str(self.name)} [{self.type}]"
-
     def get_type_color(self):
         return DNSSECKeyTemplateTypeChoices.colors.get(self.type)
 
@@ -103,6 +104,7 @@ class DNSSECKeyTemplate(ContactsMixin, NetBoxModel):
 @register_search
 class DNSSECKeyTemplateIndex(SearchIndex):
     model = DNSSECKeyTemplate
+
     fields = (
         ("name", 100),
         ("description", 500),

netbox_dns/models/dnssec_policy.py

@@ -17,6 +17,22 @@ __all__ = (
 
 
 class DNSSECPolicy(ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("DNSSEC Policy")
+        verbose_name_plural = _("DNSSEC Policies")
+
+        ordering = ("name",)
+
+    clone_fields = (
+        "name",
+        "key_templates",
+        "description",
+        "tenant",
+    )
+
+    def __str__(self):
+        return str(self.name)
+
     name = models.CharField(
         verbose_name=_("Name"),
         max_length=255,
@@ -148,22 +164,6 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "name",
-        "key_templates",
-        "description",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("DNSSEC Policy")
-        verbose_name_plural = _("DNSSEC Policies")
-
-        ordering = ("name",)
-
-    def __str__(self):
-        return str(self.name)
-
     def get_status_color(self):
         return DNSSECPolicyStatusChoices.colors.get(self.status)
 
@@ -192,6 +192,7 @@ class DNSSECPolicy(ContactsMixin, NetBoxModel):
 @register_search
 class DNSSECPolicyIndex(SearchIndex):
     model = DNSSECPolicy
+
     fields = (
         ("name", 100),
         ("description", 500),

netbox_dns/models/nameserver.py

@@ -28,31 +28,6 @@ __all__ = (
 
 
 class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
-    name = models.CharField(
-        verbose_name=_("Name"),
-        max_length=255,
-        db_collation="natural_sort",
-    )
-    description = models.CharField(
-        verbose_name=_("Description"),
-        max_length=200,
-        blank=True,
-    )
-    tenant = models.ForeignKey(
-        verbose_name=_("Tenant"),
-        to="tenancy.Tenant",
-        on_delete=models.PROTECT,
-        related_name="netbox_dns_nameservers",
-        blank=True,
-        null=True,
-    )
-
-    clone_fields = (
-        "name",
-        "description",
-        "tenant",
-    )
-
     class Meta:
         verbose_name = _("Nameserver")
         verbose_name_plural = _("Nameservers")
@@ -69,12 +44,37 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             ),
         ]
 
+    clone_fields = (
+        "name",
+        "description",
+        "tenant",
+    )
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()
         except dns_name.IDNAException:
             return self.name
 
+    name = models.CharField(
+        verbose_name=_("Name"),
+        max_length=255,
+        db_collation="natural_sort",
+    )
+    description = models.CharField(
+        verbose_name=_("Description"),
+        max_length=200,
+        blank=True,
+    )
+    tenant = models.ForeignKey(
+        verbose_name=_("Tenant"),
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_nameservers",
+        blank=True,
+        null=True,
+    )
+
     @property
     def display_name(self):
         return name_to_unicode(self.name)
@@ -138,6 +138,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class NameServerIndex(SearchIndex):
     model = NameServer
+
     fields = (
         ("name", 100),
         ("description", 500),