netbox-plugin-dns 1.2.9__py3-none-any.whl → 1.3b2__py3-none-any.whl

netbox_dns/models/zone_template.py

@@ -2,7 +2,6 @@ from dns import name as dns_name
 from dns.exception import DNSException
 
 from django.db import models
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ValidationError
 
@@ -19,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,
@@ -112,44 +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)
-
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:zonetemplate", kwargs={"pk": self.pk})
-
     def apply_to_zone_data(self, data):
         fields_changed = False
         for field in self.template_fields:
@@ -188,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,24 +100,22 @@ 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"),
         linkify=True,
@@ -115,18 +131,6 @@ 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
@@ -151,11 +155,11 @@ class ManagedRecordTable(RecordBaseTable):
 
 
 class RelatedRecordTable(RecordBaseTable):
-    actions = ActionsColumn(actions=())
-
     class Meta(NetBoxTable.Meta):
         model = Record
+
         fields = ()
+
         default_columns = (
             "name",
             "zone",
@@ -163,11 +167,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",
+    )

netbox_dns/tables/view.py

@@ -14,6 +14,19 @@ __all__ = (
 
 
 class ViewTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = View
+
+        fields = (
+            "description",
+            "ip_address_filter",
+        )
+
+        default_columns = (
+            "name",
+            "default_view",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -23,21 +36,11 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
     )
     tags = TagColumn(url_name="plugins:netbox_dns:view_list")
 
-    class Meta(NetBoxTable.Meta):
-        model = View
-        fields = ("description", "ip_address_filter")
-        default_columns = ("name", "default_view")
-
 
 class RelatedViewTable(TenancyColumnsMixin, NetBoxTable):
-    actions = ActionsColumn(actions=())
-
-    name = tables.Column(
-        linkify=True,
-    )
-
     class Meta(NetBoxTable.Meta):
         model = View
+
         fields = (
             "name",
             "description",
@@ -45,4 +48,13 @@ class RelatedViewTable(TenancyColumnsMixin, NetBoxTable):
             "tenant_group",
             "tags",
         )
-        default_columns = ("name", "description")
+
+        default_columns = (
+            "name",
+            "description",
+        )
+
+    name = tables.Column(
+        linkify=True,
+    )
+    actions = ActionsColumn(actions=())

netbox_dns/tables/zone.py

@@ -19,6 +19,27 @@ __all__ = (
 
 
 class ZoneTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = Zone
+
+        fields = (
+            "description",
+            "soa_rname",
+            "soa_serial",
+            "inline_signing",
+            "rfc2317_parent_managed",
+            "registry_domain_id",
+            "expiration_date",
+            "domain_status",
+        )
+
+        default_columns = (
+            "name",
+            "view",
+            "status",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -78,28 +99,9 @@ class ZoneTable(TenancyColumnsMixin, NetBoxTable):
     def render_name(self, value, record):
         return record.display_name
 
-    class Meta(NetBoxTable.Meta):
-        model = Zone
-        fields = (
-            "description",
-            "soa_rname",
-            "soa_serial",
-            "inline_signing",
-            "rfc2317_parent_managed",
-            "registry_domain_id",
-            "expiration_date",
-            "domain_status",
-        )
-        default_columns = (
-            "name",
-            "view",
-            "status",
-            "tags",
-        )
-
 
 class ZoneDisplayTable(ZoneTable):
-    actions = ActionsColumn(actions=("changelog",))
-
     class Meta(ZoneTable.Meta):
         pass
+
+    actions = ActionsColumn(actions=("changelog",))

netbox_dns/tables/zone_template.py

@@ -14,6 +14,19 @@ __all__ = (
 
 
 class ZoneTemplateTable(TenancyColumnsMixin, NetBoxTable):
+    class Meta(NetBoxTable.Meta):
+        model = ZoneTemplate
+
+        fields = (
+            "soa_rname",
+            "description",
+        )
+
+        default_columns = (
+            "name",
+            "tags",
+        )
+
     name = tables.Column(
         verbose_name=_("Name"),
         linkify=True,
@@ -50,25 +63,16 @@ class ZoneTemplateTable(TenancyColumnsMixin, NetBoxTable):
         linkify=True,
     )
 
-    class Meta(NetBoxTable.Meta):
-        model = ZoneTemplate
-        fields = (
-            "soa_rname",
-            "description",
-        )
-        default_columns = (
-            "name",
-            "tags",
-        )
-
 
 class ZoneTemplateDisplayTable(ZoneTemplateTable):
-    actions = ActionsColumn(actions="")
-
     class Meta(NetBoxTable.Meta):
         model = ZoneTemplate
+
         fields = ("description",)
+
         default_columns = (
             "name",
             "description",
         )
+
+    actions = ActionsColumn(actions="")

netbox_dns/views/dnssec_key_template.py

@@ -1,6 +1,5 @@
 from netbox.views import generic
 from utilities.views import register_model_view
-from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import DNSSECKeyTemplateFilterSet
 from netbox_dns.forms import (
@@ -50,13 +49,11 @@ class DNSSECKeyTemplateView(generic.ObjectView):
 class DNSSECKeyTemplateEditView(generic.ObjectEditView):
     queryset = DNSSECKeyTemplate.objects.all()
     form = DNSSECKeyTemplateForm
-    default_return_url = "plugins:netbox_dns:dnsseckeytemplate_list"
 
 
 @register_model_view(DNSSECKeyTemplate, "delete")
 class DNSSECKeyTemplateDeleteView(generic.ObjectDeleteView):
     queryset = DNSSECKeyTemplate.objects.all()
-    default_return_url = "plugins:netbox_dns:dnsseckeytemplate_list"
 
 
 @register_model_view(DNSSECKeyTemplate, "bulk_import", detail=False)
@@ -64,7 +61,6 @@ class DNSSECKeyTemplateBulkImportView(generic.BulkImportView):
     queryset = DNSSECKeyTemplate.objects.all()
     model_form = DNSSECKeyTemplateImportForm
     table = DNSSECKeyTemplateTable
-    default_return_url = "plugins:netbox_dns:dnsseckeytemplate_list"
 
 
 @register_model_view(DNSSECKeyTemplate, "bulk_edit", path="edit", detail=False)
@@ -80,8 +76,3 @@ class DNSSECKeyTemplateBulkDeleteView(generic.BulkDeleteView):
     queryset = DNSSECKeyTemplate.objects.all()
     filterset = DNSSECKeyTemplateFilterSet
     table = DNSSECKeyTemplateTable
-
-
-@register_model_view(DNSSECKeyTemplate, "contacts")
-class DNSSECKeyTemplateContactsView(ObjectContactsView):
-    queryset = DNSSECKeyTemplate.objects.all()