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

netbox_dns/models/zone.py

@@ -16,6 +16,7 @@ from django.db.models.functions import Length, Lower
 from django.db.models.signals import m2m_changed
 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
@@ -81,6 +82,80 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
 
 
 class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("Zone")
+        verbose_name_plural = _("Zones")
+
+        ordering = (
+            "view",
+            "name",
+        )
+
+        constraints = [
+            UniqueConstraint(
+                Lower("name"),
+                "view",
+                name="name_view_unique_ci",
+                violation_error_message=_(
+                    "There is already a zone with the same name in this view"
+                ),
+            ),
+        ]
+
+    clone_fields = (
+        "view",
+        "name",
+        "description",
+        "status",
+        "nameservers",
+        "default_ttl",
+        "soa_ttl",
+        "soa_mname",
+        "soa_rname",
+        "soa_refresh",
+        "soa_retry",
+        "soa_expire",
+        "soa_minimum",
+        "tenant",
+    )
+
+    soa_clean_fields = {
+        "description",
+        "status",
+        "dnssec_policy",
+        "inline_signing",
+        "parental_agents",
+        "registrar",
+        "registry_domain_id",
+        "expiration_date",
+        "domain_status",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "rfc2317_parent_managed",
+        "tenant",
+    }
+
+    objects = ZoneManager()
+
+    def __str__(self):
+        if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+            name = ". (root zone)"
+        else:
+            try:
+                name = dns_name.from_text(self.name, origin=None).to_unicode()
+            except DNSException:
+                name = self.name
+
+        try:
+            if not self.view.default_view:
+                return f"[{self.view}] {name}"
+        except ObjectDoesNotExist:
+            return f"[<no view assigned>] {name}"
+
+        return str(name)
+
     def __init__(self, *args, **kwargs):
         kwargs.pop("template", None)
 
@@ -192,6 +267,14 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         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",
@@ -285,61 +368,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    objects = ZoneManager()
-
-    clone_fields = (
-        "view",
-        "name",
-        "description",
-        "status",
-        "nameservers",
-        "default_ttl",
-        "soa_ttl",
-        "soa_mname",
-        "soa_rname",
-        "soa_refresh",
-        "soa_retry",
-        "soa_expire",
-        "soa_minimum",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("Zone")
-        verbose_name_plural = _("Zones")
-
-        ordering = (
-            "view",
-            "name",
-        )
-        constraints = [
-            UniqueConstraint(
-                Lower("name"),
-                "view",
-                name="name_view_unique_ci",
-                violation_error_message=_(
-                    "There is already a zone with the same name in this view"
-                ),
-            ),
-        ]
-
-    def __str__(self):
-        if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-            name = ". (root zone)"
-        else:
-            try:
-                name = dns_name.from_text(self.name, origin=None).to_unicode()
-            except DNSException:
-                name = self.name
-
-        try:
-            if not self.view.default_view:
-                return f"[{self.view}] {name}"
-        except ObjectDoesNotExist:
-            return f"[<no view assigned>] {name}"
-
-        return str(name)
-
     @property
     def fqdn(self):
         return f"{self.name}."
@@ -907,7 +935,9 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
         changed_fields = self.changed_fields
 
-        if self.soa_serial_auto:
+        if self.soa_serial_auto and (
+            changed_fields is None or changed_fields - self.soa_clean_fields
+        ):
             self.soa_serial = self.get_auto_serial()
 
         super().save(*args, **kwargs)
@@ -1006,7 +1036,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             for address_record in address_records:
                 address_record.ptr_record.delete()
 
-            ptr_records = self.records.filter(address_record__isnull=False)
+            ptr_records = self.records.filter(address_records__isnull=False)
             update_records = list(
                 Record.objects.filter(ptr_record__in=ptr_records).values_list(
                     "pk", flat=True
@@ -1079,6 +1109,7 @@ def update_ns_records(**kwargs):
 @register_search
 class ZoneIndex(SearchIndex):
     model = Zone
+
     fields = (
         ("name", 100),
         ("view", 150),

netbox_dns/models/zone_template.py

@@ -18,6 +18,40 @@ __all__ = (
 
 
 class ZoneTemplate(NetBoxModel):
+    class Meta:
+        verbose_name = _("Zone Template")
+        verbose_name_plural = _("Zone Templates")
+
+        ordering = ("name",)
+
+    clone_fields = (
+        "description",
+        "nameservers",
+        "record_templates",
+        "dnssec_policy",
+        "registrar",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "tenant",
+    )
+
+    template_fields = (
+        "soa_mname",
+        "soa_rname",
+        "dnssec_policy",
+        "registrar",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "tenant",
+    )
+
+    def __str__(self):
+        return str(self.name)
+
     name = models.CharField(
         verbose_name=_("Template Name"),
         unique=True,
@@ -111,40 +145,6 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "description",
-        "nameservers",
-        "record_templates",
-        "dnssec_policy",
-        "registrar",
-        "registrant",
-        "admin_c",
-        "tech_c",
-        "billing_c",
-        "tenant",
-    )
-
-    template_fields = (
-        "soa_mname",
-        "soa_rname",
-        "dnssec_policy",
-        "registrar",
-        "registrant",
-        "admin_c",
-        "tech_c",
-        "billing_c",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("Zone Template")
-        verbose_name_plural = _("Zone Templates")
-
-        ordering = ("name",)
-
-    def __str__(self):
-        return str(self.name)
-
     def apply_to_zone_data(self, data):
         fields_changed = False
         for field in self.template_fields:
@@ -183,6 +183,7 @@ class ZoneTemplate(NetBoxModel):
 @register_search
 class ZoneTemplateIndex(SearchIndex):
     model = ZoneTemplate
+
     fields = (
         ("name", 100),
         ("tenant", 300),

netbox_dns/tables/dnssec_key_template.py

@@ -1,7 +1,6 @@
 import django_tables2 as tables
 from django.utils.translation import gettext_lazy as _
 
-
 from netbox.tables import (
     NetBoxTable,
     ChoiceFieldColumn,
@@ -16,6 +15,19 @@ __all__ = ("DNSSECKeyTemplateTable",)
 
 
 class DNSSECKeyTemplateTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = DNSSECKeyTemplate
+
+        fields = ("description",)
+
+        default_columns = (
+            "name",
+            "type",
+            "algorithm",
+            "key_size",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -35,14 +47,3 @@ class DNSSECKeyTemplateTable(TenancyColumnsMixin, NetBoxTable):
     tags = TagColumn(
         url_name="plugins:netbox_dns:dnsseckeytemplate_list",
     )
-
-    class Meta(NetBoxTable.Meta):
-        model = DNSSECKeyTemplate
-        fields = ("description",)
-        default_columns = (
-            "name",
-            "type",
-            "algorithm",
-            "key_size",
-            "tags",
-        )

netbox_dns/tables/dnssec_policy.py

@@ -20,6 +20,19 @@ __all__ = (
 
 
 class DNSSECPolicyTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = DNSSECPolicy
+
+        fields = ("description",)
+
+        default_columns = (
+            "name",
+            "description",
+            "status",
+            "use_nsec3",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -88,21 +101,20 @@ class DNSSECPolicyTable(TenancyColumnsMixin, NetBoxTable):
         url_name="plugins:netbox_dns:dnssecpolicy_list",
     )
 
+
+class DNSSECPolicyDisplayTable(TenancyColumnsMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = DNSSECPolicy
+
         fields = ("description",)
+
         default_columns = (
             "name",
             "description",
             "status",
-            "use_nsec3",
             "tags",
         )
 
-
-class DNSSECPolicyDisplayTable(TenancyColumnsMixin, NetBoxTable):
-    actions = ActionsColumn(actions="")
-
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -119,13 +131,4 @@ class DNSSECPolicyDisplayTable(TenancyColumnsMixin, NetBoxTable):
     tags = TagColumn(
         url_name="plugins:netbox_dns:dnssecpolicy_list",
     )
-
-    class Meta(NetBoxTable.Meta):
-        model = DNSSECPolicy
-        fields = ("description",)
-        default_columns = (
-            "name",
-            "description",
-            "status",
-            "tags",
-        )
+    actions = ActionsColumn(actions="")

netbox_dns/tables/nameserver.py

@@ -11,6 +11,16 @@ __all__ = ("NameServerTable",)
 
 
 class NameServerTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = NameServer
+
+        fields = ("description",)
+
+        default_columns = (
+            "name",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -21,11 +31,3 @@ class NameServerTable(TenancyColumnsMixin, NetBoxTable):
 
     def render_name(self, value, record):
         return record.display_name
-
-    class Meta(NetBoxTable.Meta):
-        model = NameServer
-        fields = ("description",)
-        default_columns = (
-            "name",
-            "tags",
-        )

netbox_dns/tables/record.py

@@ -68,6 +68,24 @@ class RecordBaseTable(TenancyColumnsMixin, NetBoxTable):
 
 
 class RecordTable(RecordBaseTable):
+    class Meta(NetBoxTable.Meta):
+        model = Record
+
+        fields = (
+            "status",
+            "description",
+        )
+
+        default_columns = (
+            "name",
+            "zone",
+            "ttl",
+            "type",
+            "value",
+            "tags",
+            "active",
+        )
+
     status = ChoiceFieldColumn(
         verbose_name=_("Status"),
     )
@@ -82,27 +100,31 @@ class RecordTable(RecordBaseTable):
         linkify=True,
     )
 
+
+class ManagedRecordTable(RecordBaseTable):
     class Meta(NetBoxTable.Meta):
         model = Record
-        fields = (
-            "status",
-            "description",
-        )
+
+        fields = ()
+
         default_columns = (
             "name",
             "zone",
             "ttl",
             "type",
             "value",
-            "tags",
             "active",
         )
 
-
-class ManagedRecordTable(RecordBaseTable):
-    address_record = tables.Column(
-        verbose_name=_("Address Record"),
+    address_records = tables.ManyToManyColumn(
+        verbose_name=_("Address Records"),
         linkify=True,
+        linkify_item=True,
+        transform=lambda obj: (
+            obj.fqdn.rstrip(".")
+            if obj.zone.view.default_view
+            else f"[{obj.zone.view.name}] {obj.fqdn.rstrip('.')}"
+        ),
     )
     ipam_ip_address = tables.Column(
         verbose_name=_("IPAM IP Address"),
@@ -115,27 +137,19 @@ class ManagedRecordTable(RecordBaseTable):
     )
     actions = ActionsColumn(actions=("changelog",))
 
-    class Meta(NetBoxTable.Meta):
-        model = Record
-        fields = ()
-        default_columns = (
-            "name",
-            "zone",
-            "ttl",
-            "type",
-            "value",
-            "active",
-        )
-
     def render_related_ip_address(self, record):
         if record.ipam_ip_address is not None:
             address = record.ipam_ip_address
-        elif (
-            hasattr(record, "address_record")
-            and record.address_record.ipam_ip_address is not None
-        ):
-            address = record.address_record.ipam_ip_address
-        else:
+        elif hasattr(record, "address_records"):
+            address_record = record.address_records.filter(
+                ipam_ip_address__isnull=False
+            ).first()
+            if address_record is not None:
+                address = address_record.ipam_ip_address
+            else:
+                address = None
+
+        if address is None:
             return format_html("—")
 
         return format_html(f"<a href='{address.get_absolute_url()}'>{address}</a>")
@@ -143,19 +157,22 @@ class ManagedRecordTable(RecordBaseTable):
     def value_related_ip_address(self, record):
         if record.ipam_ip_address is not None:
             return record.ipam_ip_address
-        elif (
-            hasattr(record, "address_record")
-            and record.address_record.ipam_ip_address is not None
-        ):
-            return record.address_record.ipam_ip_address
+        elif hasattr(record, "address_records"):
+            address_record = record.address_records.filter(
+                ipam_ip_address__isnull=False
+            ).first()
+            if address_record is not None:
+                return address_record.ipam_ip_address
 
+            return None
 
-class RelatedRecordTable(RecordBaseTable):
-    actions = ActionsColumn(actions=())
 
+class RelatedRecordTable(RecordBaseTable):
     class Meta(NetBoxTable.Meta):
         model = Record
+
         fields = ()
+
         default_columns = (
             "name",
             "zone",
@@ -163,11 +180,15 @@ class RelatedRecordTable(RecordBaseTable):
             "value",
         )
 
+    actions = ActionsColumn(actions=())
+
 
 class DelegationRecordTable(RecordBaseTable):
     class Meta(NetBoxTable.Meta):
         model = Record
+
         fields = ()
+
         default_columns = (
             "name",
             "zone",

netbox_dns/tables/record_template.py

@@ -15,6 +15,23 @@ __all__ = (
 
 
 class RecordTemplateTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = RecordTemplate
+
+        fields = (
+            "status",
+            "description",
+        )
+
+        default_columns = (
+            "name",
+            "record_name",
+            "ttl",
+            "type",
+            "value",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -47,31 +64,16 @@ class RecordTemplateTable(TenancyColumnsMixin, NetBoxTable):
     def render_unicode_value(self, value):
         return value_to_unicode(value)
 
-    class Meta(NetBoxTable.Meta):
-        model = RecordTemplate
-        fields = (
-            "status",
-            "description",
-        )
-        default_columns = (
-            "name",
-            "record_name",
-            "ttl",
-            "type",
-            "value",
-            "tags",
-        )
-
 
 class RecordTemplateDisplayTable(RecordTemplateTable):
-    actions = ActionsColumn(actions="")
-
     class Meta(NetBoxTable.Meta):
         model = RecordTemplate
+
         fields = (
             "status",
             "description",
         )
+
         default_columns = (
             "name",
             "record_name",
@@ -79,3 +81,5 @@ class RecordTemplateDisplayTable(RecordTemplateTable):
             "type",
             "value",
         )
+
+    actions = ActionsColumn(actions="")

netbox_dns/tables/registrar.py

@@ -10,16 +10,9 @@ __all__ = ("RegistrarTable",)
 
 
 class RegistrarTable(NetBoxTable):
-    name = tables.Column(
-        verbose_name=_("Name"),
-        linkify=True,
-    )
-    tags = TagColumn(
-        url_name="plugins:netbox_dns:registrar_list",
-    )
-
     class Meta(NetBoxTable.Meta):
         model = Registrar
+
         fields = (
             "description",
             "iana_id",
@@ -28,4 +21,17 @@ class RegistrarTable(NetBoxTable):
             "abuse_email",
             "abuse_phone",
         )
-        default_columns = ("name", "iana_id", "referral_url")
+
+        default_columns = (
+            "name",
+            "iana_id",
+            "referral_url",
+        )
+
+    name = tables.Column(
+        verbose_name=_("Name"),
+        linkify=True,
+    )
+    tags = TagColumn(
+        url_name="plugins:netbox_dns:registrar_list",
+    )

netbox_dns/tables/registration_contact.py

@@ -10,16 +10,9 @@ __all__ = ("RegistrationContactTable",)
 
 
 class RegistrationContactTable(NetBoxTable):
-    contact_id = tables.Column(
-        verbose_name=_("Contact ID"),
-        linkify=True,
-    )
-    tags = TagColumn(
-        url_name="plugins:netbox_dns:registrationcontact_list",
-    )
-
     class Meta(NetBoxTable.Meta):
         model = RegistrationContact
+
         fields = (
             "name",
             "description",
@@ -35,4 +28,17 @@ class RegistrationContactTable(NetBoxTable):
             "fax_ext",
             "email",
         )
-        default_columns = ("contact_id", "name", "email")
+
+        default_columns = (
+            "contact_id",
+            "name",
+            "email",
+        )
+
+    contact_id = tables.Column(
+        verbose_name=_("Contact ID"),
+        linkify=True,
+    )
+    tags = TagColumn(
+        url_name="plugins:netbox_dns:registrationcontact_list",
+    )