netbox-plugin-dns 1.1.0b6__py3-none-any.whl → 1.1.1__py3-none-any.whl

netbox_dns/tables/record.py

@@ -1,5 +1,4 @@
 import django_tables2 as tables
-from django_tables2.utils import Accessor
 from django.utils.html import format_html
 
 
@@ -9,16 +8,11 @@ from netbox.tables import (
     TagColumn,
     ActionsColumn,
 )
-from ipam.lookups import Host, Inet
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
-import logging
-
-logger = logging.getLogger("netbox_dns")
-
 
 __all__ = (
     "RecordTable",
@@ -31,10 +25,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 }}",
     )
@@ -73,20 +75,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",
@@ -117,18 +107,7 @@ class ManagedRecordTable(RecordBaseTable):
 
     class Meta(NetBoxTable.Meta):
         model = Record
-        fields = (
-            "name",
-            "zone",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
-            "address_record",
-            "ipam_ip_address",
-            "related_ip_address",
-            "active",
-        )
+        fields = ()
         default_columns = (
             "name",
             "zone",
@@ -166,13 +145,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

@@ -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

@@ -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/{contact.py → registration_contact.py}

@@ -2,24 +2,23 @@ import django_tables2 as tables
 
 from netbox.tables import NetBoxTable, TagColumn
 
-from netbox_dns.models import Contact
+from netbox_dns.models import RegistrationContact
 
 
-__all__ = ("ContactTable",)
+__all__ = ("RegistrationContactTable",)
 
 
-class ContactTable(NetBoxTable):
+class RegistrationContactTable(NetBoxTable):
     contact_id = tables.Column(
         linkify=True,
     )
     tags = TagColumn(
-        url_name="plugins:netbox_dns:contact_list",
+        url_name="plugins:netbox_dns:registrationcontact_list",
     )
 
     class Meta(NetBoxTable.Meta):
-        model = Contact
+        model = RegistrationContact
         fields = (
-            "contact_id",
             "name",
             "description",
             "organization",

netbox_dns/tables/view.py

@@ -23,14 +23,7 @@ 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

@@ -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

@@ -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",

netbox_dns/templates/netbox_dns/{contact.html → registrationcontact.html}

@@ -4,7 +4,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">Contact</h5>
+                <h5 class="card-header">Registration Contact</h5>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">Name</th>

netbox_dns/urls/__init__.py

@@ -1,4 +1,4 @@
-from .contact import contact_urlpatterns
+from .registration_contact import registrationcontact_urlpatterns
 from .nameserver import nameserver_urlpatterns
 from .record import record_urlpatterns
 from .record_template import recordtemplate_urlpatterns
@@ -10,7 +10,7 @@ from .zone_template import zonetemplate_urlpatterns
 app_name = "netbox_dns"
 
 urlpatterns = (
-    contact_urlpatterns
+    registrationcontact_urlpatterns
     + nameserver_urlpatterns
     + record_urlpatterns
     + recordtemplate_urlpatterns

netbox_dns/urls/nameserver.py

@@ -1,39 +1,21 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import NameServer
 from netbox_dns.views import (
-    NameServerListView,
     NameServerView,
+    NameServerListView,
     NameServerEditView,
     NameServerDeleteView,
     NameServerBulkImportView,
     NameServerBulkEditView,
     NameServerBulkDeleteView,
-    NameServerZoneListView,
-    NameServerSOAZoneListView,
 )
 
 nameserver_urlpatterns = [
+    path("nameservers/<int:pk>/", NameServerView.as_view(), name="nameserver"),
     path("nameservers/", NameServerListView.as_view(), name="nameserver_list"),
     path("nameservers/add/", NameServerEditView.as_view(), name="nameserver_add"),
-    path(
-        "nameservers/import/",
-        NameServerBulkImportView.as_view(),
-        name="nameserver_import",
-    ),
-    path(
-        "nameservers/edit/",
-        NameServerBulkEditView.as_view(),
-        name="nameserver_bulk_edit",
-    ),
-    path(
-        "nameservers/delete/",
-        NameServerBulkDeleteView.as_view(),
-        name="nameserver_bulk_delete",
-    ),
-    path("nameservers/<int:pk>/", NameServerView.as_view(), name="nameserver"),
     path(
         "nameservers/<int:pk>/edit",
         NameServerEditView.as_view(),
@@ -45,25 +27,19 @@ nameserver_urlpatterns = [
         name="nameserver_delete",
     ),
     path(
-        "nameservers/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="nameserver_journal",
-        kwargs={"model": NameServer},
-    ),
-    path(
-        "nameservers/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="nameserver_changelog",
-        kwargs={"model": NameServer},
+        "nameservers/import/",
+        NameServerBulkImportView.as_view(),
+        name="nameserver_import",
     ),
     path(
-        "nameservers/<int:pk>/zones/",
-        NameServerZoneListView.as_view(),
-        name="nameserver_zones",
+        "nameservers/edit/",
+        NameServerBulkEditView.as_view(),
+        name="nameserver_bulk_edit",
     ),
     path(
-        "nameservers/<int:pk>/soazones/",
-        NameServerSOAZoneListView.as_view(),
-        name="nameserver_soa_zones",
+        "nameservers/delete/",
+        NameServerBulkDeleteView.as_view(),
+        name="nameserver_bulk_delete",
     ),
+    path("nameservers/<int:pk>/", include(get_model_urls("netbox_dns", "nameserver"))),
 ]

netbox_dns/urls/record.py

@@ -1,11 +1,10 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Record
 from netbox_dns.views import (
-    RecordListView,
     RecordView,
+    RecordListView,
     RecordEditView,
     RecordDeleteView,
     RecordBulkImportView,
@@ -15,26 +14,15 @@ from netbox_dns.views import (
 )
 
 record_urlpatterns = [
+    path("records/<int:pk>/", RecordView.as_view(), name="record"),
     path("records/", RecordListView.as_view(), name="record_list"),
     path("records/add/", RecordEditView.as_view(), name="record_add"),
+    path("records/<int:pk>/edit/", RecordEditView.as_view(), name="record_edit"),
+    path("records/<int:pk>/delete/", RecordDeleteView.as_view(), name="record_delete"),
     path("records/import/", RecordBulkImportView.as_view(), name="record_import"),
     path("records/edit/", RecordBulkEditView.as_view(), name="record_bulk_edit"),
     path("records/delete/", RecordBulkDeleteView.as_view(), name="record_bulk_delete"),
-    path("records/<int:pk>/", RecordView.as_view(), name="record"),
-    path("records/<int:pk>/edit/", RecordEditView.as_view(), name="record_edit"),
-    path("records/<int:pk>/delete/", RecordDeleteView.as_view(), name="record_delete"),
-    path(
-        "records/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="record_journal",
-        kwargs={"model": Record},
-    ),
-    path(
-        "records/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="record_changelog",
-        kwargs={"model": Record},
-    ),
+    path("records/<int:pk>/", include(get_model_urls("netbox_dns", "record"))),
     path(
         "managedrecords/", ManagedRecordListView.as_view(), name="managed_record_list"
     ),

netbox_dns/urls/record_template.py

@@ -1,11 +1,10 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import RecordTemplate
 from netbox_dns.views import (
-    RecordTemplateListView,
     RecordTemplateView,
+    RecordTemplateListView,
     RecordTemplateEditView,
     RecordTemplateDeleteView,
     RecordTemplateBulkImportView,
@@ -14,6 +13,9 @@ from netbox_dns.views import (
 )
 
 recordtemplate_urlpatterns = [
+    path(
+        "recordtemplates/<int:pk>/", RecordTemplateView.as_view(), name="recordtemplate"
+    ),
     path(
         "recordtemplates/", RecordTemplateListView.as_view(), name="recordtemplate_list"
     ),
@@ -22,6 +24,16 @@ recordtemplate_urlpatterns = [
         RecordTemplateEditView.as_view(),
         name="recordtemplate_add",
     ),
+    path(
+        "recordtemplates/<int:pk>/edit/",
+        RecordTemplateEditView.as_view(),
+        name="recordtemplate_edit",
+    ),
+    path(
+        "recordtemplates/<int:pk>/delete/",
+        RecordTemplateDeleteView.as_view(),
+        name="recordtemplate_delete",
+    ),
     path(
         "recordtemplates/import/",
         RecordTemplateBulkImportView.as_view(),
@@ -38,28 +50,7 @@ recordtemplate_urlpatterns = [
         name="recordtemplate_bulk_delete",
     ),
     path(
-        "recordtemplates/<int:pk>/", RecordTemplateView.as_view(), name="recordtemplate"
-    ),
-    path(
-        "recordtemplates/<int:pk>/edit/",
-        RecordTemplateEditView.as_view(),
-        name="recordtemplate_edit",
-    ),
-    path(
-        "recordtemplates/<int:pk>/delete/",
-        RecordTemplateDeleteView.as_view(),
-        name="recordtemplate_delete",
-    ),
-    path(
-        "recordtemplates/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="recordtemplate_journal",
-        kwargs={"model": RecordTemplate},
-    ),
-    path(
-        "recordtemplates/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="recordtemplate_changelog",
-        kwargs={"model": RecordTemplate},
+        "recordtemplates/<int:pk>/",
+        include(get_model_urls("netbox_dns", "recordtemplate")),
     ),
 ]

netbox_dns/urls/registrar.py

@@ -1,63 +1,39 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Registrar
 from netbox_dns.views import (
-    RegistrarListView,
     RegistrarView,
-    RegistrarDeleteView,
+    RegistrarListView,
     RegistrarEditView,
+    RegistrarDeleteView,
     RegistrarBulkImportView,
     RegistrarBulkEditView,
     RegistrarBulkDeleteView,
-    RegistrarZoneListView,
 )
 
 registrar_urlpatterns = [
+    path("registrars/<int:pk>/", RegistrarView.as_view(), name="registrar"),
     path("registrars/", RegistrarListView.as_view(), name="registrar_list"),
     path("registrars/add/", RegistrarEditView.as_view(), name="registrar_add"),
     path(
-        "registrars/import/",
-        RegistrarBulkImportView.as_view(),
-        name="registrar_import",
-    ),
-    path(
-        "registrars/edit/",
-        RegistrarBulkEditView.as_view(),
-        name="registrar_bulk_edit",
+        "registrars/<int:pk>/edit/", RegistrarEditView.as_view(), name="registrar_edit"
     ),
     path(
         "registrars/delete/",
         RegistrarBulkDeleteView.as_view(),
         name="registrar_bulk_delete",
     ),
-    path("registrars/<int:pk>/", RegistrarView.as_view(), name="registrar"),
     path(
-        "registrars/<int:pk>/edit/",
-        RegistrarEditView.as_view(),
-        name="registrar_edit",
+        "registrars/import/", RegistrarBulkImportView.as_view(), name="registrar_import"
+    ),
+    path(
+        "registrars/edit/", RegistrarBulkEditView.as_view(), name="registrar_bulk_edit"
     ),
     path(
         "registrars/<int:pk>/delete/",
         RegistrarDeleteView.as_view(),
         name="registrar_delete",
     ),
-    path(
-        "registrars/<int:pk>/zones/",
-        RegistrarZoneListView.as_view(),
-        name="registrar_zones",
-    ),
-    path(
-        "registrars/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="registrar_journal",
-        kwargs={"model": Registrar},
-    ),
-    path(
-        "registrars/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="registrar_changelog",
-        kwargs={"model": Registrar},
-    ),
+    path("registrars/<int:pk>/", include(get_model_urls("netbox_dns", "registrar"))),
 ]

netbox_dns/urls/registration_contact.py

@@ -0,0 +1,60 @@
+from django.urls import include, path
+
+from utilities.urls import get_model_urls
+
+from netbox_dns.views import (
+    RegistrationContactView,
+    RegistrationContactListView,
+    RegistrationContactEditView,
+    RegistrationContactDeleteView,
+    RegistrationContactBulkImportView,
+    RegistrationContactBulkEditView,
+    RegistrationContactBulkDeleteView,
+)
+
+registrationcontact_urlpatterns = [
+    path(
+        "registrationcontacts/<int:pk>/",
+        RegistrationContactView.as_view(),
+        name="registrationcontact",
+    ),
+    path(
+        "registrationcontacts/",
+        RegistrationContactListView.as_view(),
+        name="registrationcontact_list",
+    ),
+    path(
+        "registrationcontacts/add/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_add",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/edit/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_edit",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/delete/",
+        RegistrationContactDeleteView.as_view(),
+        name="registrationcontact_delete",
+    ),
+    path(
+        "registrationcontacts/import/",
+        RegistrationContactBulkImportView.as_view(),
+        name="registrationcontact_import",
+    ),
+    path(
+        "registrationcontacts/edit/",
+        RegistrationContactBulkEditView.as_view(),
+        name="registrationcontact_bulk_edit",
+    ),
+    path(
+        "registrationcontacts/delete/",
+        RegistrationContactBulkDeleteView.as_view(),
+        name="registrationcontact_bulk_delete",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/",
+        include(get_model_urls("netbox_dns", "registrationcontact")),
+    ),
+]

netbox_dns/urls/view.py

@@ -1,42 +1,28 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import View
 from netbox_dns.views import (
-    ViewListView,
     ViewView,
-    ViewDeleteView,
+    ViewListView,
     ViewEditView,
+    ViewDeleteView,
     ViewBulkImportView,
     ViewBulkEditView,
     ViewBulkDeleteView,
-    ViewZoneListView,
     ViewPrefixEditView,
 )
 
 view_urlpatterns = [
+    path("views/<int:pk>/", ViewView.as_view(), name="view"),
     path("views/", ViewListView.as_view(), name="view_list"),
     path("views/add/", ViewEditView.as_view(), name="view_add"),
+    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
+    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
     path("views/import/", ViewBulkImportView.as_view(), name="view_import"),
     path("views/edit/", ViewBulkEditView.as_view(), name="view_bulk_edit"),
     path("views/delete/", ViewBulkDeleteView.as_view(), name="view_bulk_delete"),
-    path("views/<int:pk>/", ViewView.as_view(), name="view"),
-    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
-    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
-    path("views/<int:pk>/zones/", ViewZoneListView.as_view(), name="view_zones"),
-    path(
-        "views/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="view_journal",
-        kwargs={"model": View},
-    ),
-    path(
-        "views/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="view_changelog",
-        kwargs={"model": View},
-    ),
+    path("views/<int:pk>/", include(get_model_urls("netbox_dns", "view"))),
     path(
         "prefixes/<int:pk>/assign-views/",
         ViewPrefixEditView.as_view(),