netbox-plugin-dns 1.1.0__py3-none-any.whl → 1.1.0b1__py3-none-any.whl

netbox_dns/tables/view.py

@@ -23,7 +23,14 @@ class ViewTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = View
-        fields = ("description",)
+        fields = (
+            "name",
+            "default_view",
+            "description",
+            "tenant",
+            "tenant_group",
+            "tags",
+        )
         default_columns = ("name", "default_view")
 
 

netbox_dns/tables/zone.py

@@ -58,11 +58,26 @@ 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,7 +37,18 @@ class ZoneTemplateTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = ZoneTemplate
-        fields = ("description",)
+        fields = (
+            "name",
+            "description",
+            "tags",
+            "registrar",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            "tenant",
+            "tenant_group",
+        )
         default_columns = (
             "name",
             "tags",
@@ -49,7 +60,10 @@ class ZoneTemplateDisplayTable(ZoneTemplateTable):
 
     class Meta(NetBoxTable.Meta):
         model = ZoneTemplate
-        fields = ("description",)
+        fields = (
+            "name",
+            "description",
+        )
         default_columns = (
             "name",
             "description",

netbox_dns/template_content.py

@@ -1,10 +1,9 @@
 from django.conf import settings
-from django.urls import reverse
 
 from netbox.plugins.utils import get_plugin_config
 from netbox.plugins import PluginTemplateExtension
 
-from netbox_dns.models import Record
+from netbox_dns.models import Record, Zone, View, NameServer
 from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.tables import RelatedRecordTable, RelatedViewTable
 from netbox_dns.utilities import get_views_by_prefix
@@ -64,17 +63,6 @@ class RelatedDNSViews(PluginTemplateExtension):
             extra_context=context,
         )
 
-    def buttons(self):
-        return self.render(
-            "netbox_dns/view/button.html",
-            extra_context={
-                "url": reverse(
-                    "plugins:netbox_dns:prefix_views",
-                    kwargs={"pk": self.context.get("object").pk},
-                ),
-            },
-        )
-
 
 class IPRelatedDNSRecords(PluginTemplateExtension):
     model = "ipam.ipaddress"
@@ -114,7 +102,7 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
         )
 
 
-if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+if not settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
     template_extensions = [RelatedDNSRecords, RelatedDNSViews]
 else:
     template_extensions = []

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

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

netbox_dns/templates/netbox_dns/view.html

@@ -35,7 +35,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/tags.html' %}
-            {% if not settings.PLUGINS_CONFIG.netbox_dns.dnssync_disabled %}
+            {% if not settings.PLUGINS_CONFIG.netbox_dns.autodns_disabled %}
             <div class="card">
                 <h5 class="card-header">
                     IPAM Prefixes
@@ -45,11 +45,15 @@
                         {% for prefix in object.prefixes.all %}
                         <tr>
                             <td>
-                                {{ prefix|linkify }}
+                                <a href="{% url 'ipam:prefix' pk=prefix.pk %}">
+                                    {{ prefix }}
+                                </a>
                             </td>
                             {% if prefix.vrf %}
                             <td>
-                                {{ prefix.vrf|linkify }}
+                                <a href="{% url 'ipam:vrf' pk=prefix.vrf.pk %}">
+                                    {{ prefix.vrf }}
+                                </a>
                             </td>
                             {% else %}
                             <td>Global</td>

netbox_dns/urls/__init__.py

@@ -1,4 +1,4 @@
-from .registration_contact import registrationcontact_urlpatterns
+from .contact import contact_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 = (
-    registrationcontact_urlpatterns
+    contact_urlpatterns
     + nameserver_urlpatterns
     + record_urlpatterns
     + recordtemplate_urlpatterns

netbox_dns/urls/contact.py

@@ -0,0 +1,51 @@
+from django.urls import path
+
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+
+from netbox_dns.models import Contact
+from netbox_dns.views import (
+    ContactListView,
+    ContactView,
+    ContactDeleteView,
+    ContactEditView,
+    ContactBulkImportView,
+    ContactBulkEditView,
+    ContactBulkDeleteView,
+    ContactZoneListView,
+)
+
+contact_urlpatterns = [
+    path("contacts/", ContactListView.as_view(), name="contact_list"),
+    path("contacts/add/", ContactEditView.as_view(), name="contact_add"),
+    path("contacts/import/", ContactBulkImportView.as_view(), name="contact_import"),
+    path("contacts/edit/", ContactBulkEditView.as_view(), name="contact_bulk_edit"),
+    path(
+        "contacts/delete/",
+        ContactBulkDeleteView.as_view(),
+        name="contact_bulk_delete",
+    ),
+    path("contacts/<int:pk>/", ContactView.as_view(), name="contact"),
+    path("contacts/<int:pk>/edit/", ContactEditView.as_view(), name="contact_edit"),
+    path(
+        "contacts/<int:pk>/delete/",
+        ContactDeleteView.as_view(),
+        name="contact_delete",
+    ),
+    path(
+        "contacts/<int:pk>/zones/",
+        ContactZoneListView.as_view(),
+        name="contact_zones",
+    ),
+    path(
+        "contacts/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="contact_journal",
+        kwargs={"model": Contact},
+    ),
+    path(
+        "contacts/<int:pk>/changelog/",
+        ObjectChangeLogView.as_view(),
+        name="contact_changelog",
+        kwargs={"model": Contact},
+    ),
+]

netbox_dns/urls/nameserver.py

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

netbox_dns/urls/record.py

@@ -1,10 +1,11 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import Record
 from netbox_dns.views import (
-    RecordView,
     RecordListView,
+    RecordView,
     RecordEditView,
     RecordDeleteView,
     RecordBulkImportView,
@@ -14,15 +15,26 @@ 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>/", include(get_model_urls("netbox_dns", "record"))),
+    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(
         "managedrecords/", ManagedRecordListView.as_view(), name="managed_record_list"
     ),

netbox_dns/urls/record_template.py

@@ -1,10 +1,11 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import RecordTemplate
 from netbox_dns.views import (
-    RecordTemplateView,
     RecordTemplateListView,
+    RecordTemplateView,
     RecordTemplateEditView,
     RecordTemplateDeleteView,
     RecordTemplateBulkImportView,
@@ -13,9 +14,6 @@ from netbox_dns.views import (
 )
 
 recordtemplate_urlpatterns = [
-    path(
-        "recordtemplates/<int:pk>/", RecordTemplateView.as_view(), name="recordtemplate"
-    ),
     path(
         "recordtemplates/", RecordTemplateListView.as_view(), name="recordtemplate_list"
     ),
@@ -24,16 +22,6 @@ 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(),
@@ -50,7 +38,28 @@ recordtemplate_urlpatterns = [
         name="recordtemplate_bulk_delete",
     ),
     path(
-        "recordtemplates/<int:pk>/",
-        include(get_model_urls("netbox_dns", "recordtemplate")),
+        "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},
     ),
 ]

netbox_dns/urls/registrar.py

@@ -1,39 +1,63 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import Registrar
 from netbox_dns.views import (
-    RegistrarView,
     RegistrarListView,
-    RegistrarEditView,
+    RegistrarView,
     RegistrarDeleteView,
+    RegistrarEditView,
     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/<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/delete/",
         RegistrarBulkDeleteView.as_view(),
         name="registrar_bulk_delete",
     ),
+    path("registrars/<int:pk>/", RegistrarView.as_view(), name="registrar"),
     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/<int:pk>/delete/",
         RegistrarDeleteView.as_view(),
         name="registrar_delete",
     ),
-    path("registrars/<int:pk>/", include(get_model_urls("netbox_dns", "registrar"))),
+    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},
+    ),
 ]

netbox_dns/urls/view.py

@@ -1,31 +1,39 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import View
 from netbox_dns.views import (
-    ViewView,
     ViewListView,
-    ViewEditView,
+    ViewView,
     ViewDeleteView,
+    ViewEditView,
     ViewBulkImportView,
     ViewBulkEditView,
     ViewBulkDeleteView,
-    ViewPrefixEditView,
+    ViewZoneListView,
 )
 
 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>/", include(get_model_urls("netbox_dns", "view"))),
+    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(
-        "prefixes/<int:pk>/assign-views/",
-        ViewPrefixEditView.as_view(),
-        name="prefix_views",
+        "views/<int:pk>/changelog/",
+        ObjectChangeLogView.as_view(),
+        name="view_changelog",
+        kwargs={"model": View},
     ),
 ]

netbox_dns/urls/zone.py

@@ -1,25 +1,63 @@
-from django.urls import include, path
+from django.urls import path
 
-from utilities.urls import get_model_urls
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
+from netbox_dns.models import Zone
 from netbox_dns.views import (
-    ZoneView,
     ZoneListView,
-    ZoneEditView,
+    ZoneView,
     ZoneDeleteView,
+    ZoneEditView,
     ZoneBulkImportView,
     ZoneBulkEditView,
     ZoneBulkDeleteView,
+    ZoneRecordListView,
+    ZoneManagedRecordListView,
+    ZoneRegistrationView,
+    ZoneRFC2317ChildZoneListView,
+    ZoneChildZoneListView,
 )
 
 zone_urlpatterns = [
-    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
     path("zones/", ZoneListView.as_view(), name="zone_list"),
     path("zones/add/", ZoneEditView.as_view(), name="zone_add"),
-    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
-    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
     path("zones/import/", ZoneBulkImportView.as_view(), name="zone_import"),
     path("zones/edit/", ZoneBulkEditView.as_view(), name="zone_bulk_edit"),
     path("zones/delete/", ZoneBulkDeleteView.as_view(), name="zone_bulk_delete"),
-    path("zones/<int:pk>/", include(get_model_urls("netbox_dns", "zone"))),
+    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
+    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
+    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
+    path("zones/<int:pk>/records/", ZoneRecordListView.as_view(), name="zone_records"),
+    path(
+        "zones/<int:pk>/managedrecords/",
+        ZoneManagedRecordListView.as_view(),
+        name="zone_managed_records",
+    ),
+    path(
+        "zones/<int:pk>/rfc2317childzones/",
+        ZoneRFC2317ChildZoneListView.as_view(),
+        name="zone_rfc2317_child_zones",
+    ),
+    path(
+        "zones/<int:pk>/childzones/",
+        ZoneChildZoneListView.as_view(),
+        name="zone_child_zones",
+    ),
+    path(
+        "zones/<int:pk>/registration/",
+        ZoneRegistrationView.as_view(),
+        name="zone_registration",
+    ),
+    path(
+        "zones/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="zone_journal",
+        kwargs={"model": Zone},
+    ),
+    path(
+        "zones/<int:pk>/changelog/",
+        ObjectChangeLogView.as_view(),
+        name="zone_changelog",
+        kwargs={"model": Zone},
+    ),
 ]