netbox-plugin-dns 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

netbox_dns/models/contact.py

@@ -7,7 +7,7 @@ from netbox.search import SearchIndex, register_search
 from taggit.managers import TaggableManager
 
 
-__ALL__ = (
+__all__ = (
     "Contact",
     "ContactIndex",
 )
@@ -87,7 +87,7 @@ class Contact(NetBoxModel):
         related_name="netbox_dns_contact_set",
     )
 
-    clone_fields = [
+    clone_fields = (
         "name",
         "description",
         "organization",
@@ -102,7 +102,7 @@ class Contact(NetBoxModel):
         "fax_ext",
         "email",
         "tags",
-    ]
+    )
 
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:contact", kwargs={"pk": self.pk})
@@ -114,7 +114,13 @@ class Contact(NetBoxModel):
         return self.contact_id
 
     class Meta:
-        ordering = ("name", "contact_id")
+        verbose_name = "Contact"
+        verbose_name_plural = "Contacts"
+
+        ordering = (
+            "name",
+            "contact_id",
+        )
 
     @property
     def zones(self):

netbox_dns/models/nameserver.py

@@ -7,6 +7,7 @@ from django.urls import reverse
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
+from netbox.models.features import ContactsMixin
 
 from netbox_dns.utilities import (
     name_to_unicode,
@@ -20,13 +21,13 @@ from netbox_dns.mixins import ObjectModificationMixin
 from .record import Record
 
 
-__ALL__ = (
+__all__ = (
     "NameServer",
     "NameServerIndex",
 )
 
 
-class NameServer(ObjectModificationMixin, NetBoxModel):
+class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -43,13 +44,17 @@ class NameServer(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     class Meta:
-        ordering = ("name",)
         verbose_name = "Nameserver"
         verbose_name_plural = "Nameservers"
 
+        ordering = ("name",)
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()

netbox_dns/models/record.py

@@ -9,6 +9,7 @@ from django.db.models import Q, ExpressionWrapper, BooleanField, Min
 from django.urls import reverse
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -24,7 +25,8 @@ from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 # -
 from netbox_dns.models import zone
 
-__ALL__ = (
+
+__all__ = (
     "Record",
     "RecordIndex",
 )
@@ -61,7 +63,7 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Record(ObjectModificationMixin, NetBoxModel):
+class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -154,7 +156,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
     objects = RecordManager()
     raw_objects = RestrictedQuerySet.as_manager()
 
-    clone_fields = [
+    clone_fields = (
         "zone",
         "type",
         "name",
@@ -163,10 +165,20 @@ class Record(ObjectModificationMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
-    ]
+    )
 
     class Meta:
-        ordering = ("zone", "name", "type", "value", "status")
+        verbose_name = "Record"
+        verbose_name_plural = "Records"
+
+        ordering = (
+            "fqdn",
+            "zone",
+            "name",
+            "type",
+            "value",
+            "status",
+        )
 
     def __str__(self):
         try:
@@ -519,6 +531,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             )
             .exclude(ttl=self.ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
         if not records.exists():
@@ -553,6 +566,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             .exclude(pk=self.pk)
             .exclude(ttl=ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
         for record in records:

netbox_dns/models/record_template.py

@@ -15,7 +15,7 @@ from netbox_dns.validators import validate_generic_name, validate_record_value
 from .record import Record
 
 
-__ALL__ = (
+__all__ = (
     "RecordTemplate",
     "RecordTemplateIndex",
 )
@@ -85,7 +85,10 @@ class RecordTemplate(NetBoxModel):
     )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Record Template"
+        verbose_name_plural = "Record Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/registrar.py

@@ -5,7 +5,7 @@ from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
 
 
-__ALL__ = (
+__all__ = (
     "Registrar",
     "RegistrarIndex",
 )
@@ -59,7 +59,13 @@ class Registrar(NetBoxModel):
         return str(self.name)
 
     class Meta:
-        ordering = ("name", "iana_id")
+        verbose_name = "Registrar"
+        verbose_name_plural = "Registrars"
+
+        ordering = (
+            "name",
+            "iana_id",
+        )
 
 
 @register_search

netbox_dns/models/view.py

@@ -3,6 +3,7 @@ from django.urls import reverse
 from django.core.exceptions import ValidationError
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.context import current_request
 from utilities.exceptions import AbortRequest
@@ -10,13 +11,13 @@ from utilities.exceptions import AbortRequest
 from netbox_dns.mixins import ObjectModificationMixin
 
 
-__ALL__ = (
+__all__ = (
     "View",
     "ViewIndex",
 )
 
 
-class View(ObjectModificationMixin, NetBoxModel):
+class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -36,7 +37,10 @@ class View(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     @classmethod
     def get_default_view(cls):
@@ -49,6 +53,9 @@ class View(ObjectModificationMixin, NetBoxModel):
         return str(self.name)
 
     class Meta:
+        verbose_name = "View"
+        verbose_name_plural = "Views"
+
         ordering = ("name",)
 
     def delete(self, *args, **kwargs):

netbox_dns/models/zone.py

@@ -19,6 +19,7 @@ from django.dispatch import receiver
 from django.conf import settings
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -34,6 +35,7 @@ from netbox_dns.utilities import (
 )
 from netbox_dns.validators import (
     validate_fqdn,
+    validate_rname,
     validate_domain_name,
 )
 from netbox_dns.mixins import ObjectModificationMixin
@@ -43,7 +45,7 @@ from .view import View
 from .nameserver import NameServer
 
 
-__ALL__ = (
+__all__ = (
     "Zone",
     "ZoneIndex",
 )
@@ -66,7 +68,7 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Zone(ObjectModificationMixin, NetBoxModel):
+class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (ZoneStatusChoices.STATUS_ACTIVE,)
 
     def __init__(self, *args, **kwargs):
@@ -245,7 +247,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
 
     objects = ZoneManager()
 
-    clone_fields = [
+    clone_fields = (
         "view",
         "name",
         "status",
@@ -259,9 +261,12 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         "soa_expire",
         "soa_minimum",
         "description",
-    ]
+    )
 
     class Meta:
+        verbose_name = "Zone"
+        verbose_name_plural = "Zones"
+
         ordering = (
             "view",
             "name",
@@ -618,7 +623,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             raise ValidationError("soa_rname not set and no default value defined")
         try:
             dns_name.from_text(self.soa_rname, origin=dns_name.root)
-            validate_fqdn(self.soa_rname)
+            validate_rname(self.soa_rname)
         except (DNSException, ValidationError) as exc:
             raise ValidationError(
                 {
@@ -638,7 +643,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             old_zone = Zone.objects.get(pk=self.pk)
             if not self.soa_serial_auto:
                 self.check_soa_serial_increment(old_zone.soa_serial, self.soa_serial)
-            else:
+            elif not old_zone.soa_serial_auto:
                 try:
                     self.check_soa_serial_increment(
                         old_zone.soa_serial, self.get_auto_serial()
@@ -800,10 +805,11 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                 address_record.ptr_record.delete()
 
             ptr_records = self.record_set.filter(address_record__isnull=False)
-            update_records = [
-                address_record.pk
-                for address_record in Record.objects.filter(ptr_record__in=ptr_records)
-            ]
+            update_records = list(
+                Record.objects.filter(ptr_record__in=ptr_records).values_list(
+                    "pk", flat=True
+                )
+            )
 
             cname_records = {
                 ptr_record.rfc2317_cname_record
@@ -818,9 +824,9 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                 cname_zone.save_soa_serial()
                 cname_zone.update_soa_record()
 
-            rfc2317_child_zones = [
-                child_zone.pk for child_zone in self.rfc2317_child_zones.all()
-            ]
+            rfc2317_child_zones = list(
+                self.rfc2317_child_zones.all().values_list("pk", flat=True)
+            )
 
             if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
                 for ip in IPAddress.objects.filter(

netbox_dns/models/zone_template.py

@@ -5,7 +5,7 @@ from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
 
 
-__ALL__ = (
+__all__ = (
     "ZoneTemplate",
     "ZoneTemplateIndex",
 )
@@ -82,28 +82,32 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
 
-    clone_fields = [
+    clone_fields = (
         "description",
         "nameservers",
+        "record_templates",
         "tenant",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
-    template_fields = [
+    template_fields = (
         "tenant",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Zone Template"
+        verbose_name_plural = "Zone Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/tables/contact.py

@@ -5,7 +5,7 @@ from netbox.tables import NetBoxTable, TagColumn
 from netbox_dns.models import Contact
 
 
-__ALL__ = ("ContactTable",)
+__all__ = ("ContactTable",)
 
 
 class ContactTable(NetBoxTable):
@@ -19,7 +19,6 @@ class ContactTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = Contact
         fields = (
-            "contact_id",
             "name",
             "description",
             "organization",

netbox_dns/tables/nameserver.py

@@ -6,7 +6,7 @@ from tenancy.tables import TenancyColumnsMixin
 from netbox_dns.models import NameServer
 
 
-__ALL__ = ("NameServerTable",)
+__all__ = ("NameServerTable",)
 
 
 class NameServerTable(TenancyColumnsMixin, NetBoxTable):
@@ -22,13 +22,7 @@ class NameServerTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = NameServer
-        fields = (
-            "name",
-            "description",
-            "tags",
-            "tenant",
-            "tenant_group",
-        )
+        fields = ("description",)
         default_columns = (
             "name",
             "tags",

netbox_dns/tables/record.py

@@ -12,7 +12,7 @@ from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
 
-__ALL__ = (
+__all__ = (
     "RecordTable",
     "ManagedRecordTable",
     "RelatedRecordTable",
@@ -23,10 +23,18 @@ class RecordBaseTable(TenancyColumnsMixin, NetBoxTable):
     zone = tables.Column(
         linkify=True,
     )
+    view = tables.Column(
+        accessor="zone__view",
+        linkify=True,
+    )
     type = tables.Column()
     name = tables.Column(
         linkify=True,
     )
+    fqdn = tables.Column(
+        verbose_name="FQDN",
+        linkify=True,
+    )
     value = tables.TemplateColumn(
         template_code="{{ value|truncatechars:64 }}",
     )
@@ -65,20 +73,8 @@ class RecordTable(RecordBaseTable):
     class Meta(NetBoxTable.Meta):
         model = Record
         fields = (
-            "name",
-            "zone",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
             "status",
-            "disable_ptr",
-            "ptr_record",
-            "tags",
-            "active",
             "description",
-            "tenant",
-            "tenant_group",
         )
         default_columns = (
             "name",
@@ -104,17 +100,7 @@ class ManagedRecordTable(RecordBaseTable):
 
     class Meta(NetBoxTable.Meta):
         model = Record
-        fields = (
-            "name",
-            "zone",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
-            "address_record",
-            "ipam_ip_address",
-            "active",
-        )
+        fields = ()
         default_columns = (
             "name",
             "zone",
@@ -130,13 +116,7 @@ class RelatedRecordTable(RecordBaseTable):
 
     class Meta(NetBoxTable.Meta):
         model = Record
-        fields = (
-            "name",
-            "zone",
-            "type",
-            "value",
-            "unicode_value",
-        )
+        fields = ()
         default_columns = (
             "name",
             "zone",

netbox_dns/tables/record_template.py

@@ -7,7 +7,7 @@ from netbox_dns.models import RecordTemplate
 from netbox_dns.utilities import value_to_unicode
 
 
-__ALL__ = (
+__all__ = (
     "RecordTemplateTable",
     "RecordTemplateDisplayTable",
 )
@@ -43,18 +43,8 @@ class RecordTemplateTable(TenancyColumnsMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = RecordTemplate
         fields = (
-            "name",
-            "record_name",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
             "status",
-            "disable_ptr",
-            "tags",
             "description",
-            "tenant",
-            "tenant_group",
         )
         default_columns = (
             "name",
@@ -72,14 +62,7 @@ class RecordTemplateDisplayTable(RecordTemplateTable):
     class Meta(NetBoxTable.Meta):
         model = RecordTemplate
         fields = (
-            "name",
-            "record_name",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
             "status",
-            "disable_ptr",
             "description",
         )
         default_columns = (

netbox_dns/tables/registrar.py

@@ -5,7 +5,7 @@ from netbox.tables import NetBoxTable, TagColumn
 from netbox_dns.models import Registrar
 
 
-__ALL__ = ("RegistrarTable",)
+__all__ = ("RegistrarTable",)
 
 
 class RegistrarTable(NetBoxTable):
@@ -19,13 +19,11 @@ class RegistrarTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = Registrar
         fields = (
-            "name",
             "description",
             "iana_id",
             "referral_url",
             "whois_server",
             "abuse_email",
             "abuse_phone",
-            "tags",
         )
         default_columns = ("name", "iana_id", "referral_url")

netbox_dns/tables/view.py

@@ -6,7 +6,7 @@ from tenancy.tables import TenancyColumnsMixin
 from netbox_dns.models import View
 
 
-__ALL__ = ("ViewTable",)
+__all__ = ("ViewTable",)
 
 
 class ViewTable(TenancyColumnsMixin, NetBoxTable):
@@ -20,12 +20,5 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = View
-        fields = (
-            "name",
-            "default_view",
-            "description",
-            "tenant",
-            "tenant_group",
-            "tags",
-        )
+        fields = ("description",)
         default_columns = ("name", "default_view")

netbox_dns/tables/zone.py

@@ -10,7 +10,7 @@ from tenancy.tables import TenancyColumnsMixin
 from netbox_dns.models import Zone
 
 
-__ALL__ = ("ZoneTable",)
+__all__ = ("ZoneTable",)
 
 
 class ZoneTable(TenancyColumnsMixin, NetBoxTable):
@@ -58,26 +58,11 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = Zone
         fields = (
-            "name",
-            "view",
-            "status",
             "description",
-            "tags",
-            "default_ttl",
-            "soa_mname",
             "soa_rname",
             "soa_serial",
-            "rfc2317_prefix",
             "rfc2317_parent_managed",
-            "rfc2317_parent_zone",
-            "registrar",
             "registry_domain_id",
-            "registrant",
-            "admin_c",
-            "tech_c",
-            "billing_c",
-            "tenant",
-            "tenant_group",
         )
         default_columns = (
             "name",

netbox_dns/tables/zone_template.py

@@ -6,7 +6,7 @@ from tenancy.tables import TenancyColumnsMixin
 from netbox_dns.models import ZoneTemplate
 
 
-__ALL__ = (
+__all__ = (
     "ZoneTemplateTable",
     "ZoneTemplateDisplayTable",
 )
@@ -37,18 +37,7 @@ class ZoneTemplateTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = ZoneTemplate
-        fields = (
-            "name",
-            "description",
-            "tags",
-            "registrar",
-            "registrant",
-            "admin_c",
-            "tech_c",
-            "billing_c",
-            "tenant",
-            "tenant_group",
-        )
+        fields = ("description",)
         default_columns = (
             "name",
             "tags",
@@ -60,10 +49,7 @@ class ZoneTemplateDisplayTable(ZoneTemplateTable):
 
     class Meta(NetBoxTable.Meta):
         model = ZoneTemplate
-        fields = (
-            "name",
-            "description",
-        )
+        fields = ("description",)
         default_columns = (
             "name",
             "description",