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

netbox_dns/tables/view.py

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

@@ -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/urls/contact.py

@@ -1,51 +1,29 @@
-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 Contact
 from netbox_dns.views import (
-    ContactListView,
     ContactView,
-    ContactDeleteView,
+    ContactListView,
     ContactEditView,
+    ContactDeleteView,
     ContactBulkImportView,
     ContactBulkEditView,
     ContactBulkDeleteView,
-    ContactZoneListView,
 )
 
 contact_urlpatterns = [
+    path("contacts/<int:pk>/", ContactView.as_view(), name="contact"),
     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},
+        "contacts/<int:pk>/delete/", ContactDeleteView.as_view(), name="contact_delete"
     ),
+    path("contacts/import/", ContactBulkImportView.as_view(), name="contact_import"),
+    path("contacts/edit/", ContactBulkEditView.as_view(), name="contact_bulk_edit"),
     path(
-        "contacts/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="contact_changelog",
-        kwargs={"model": Contact},
+        "contacts/delete/", ContactBulkDeleteView.as_view(), name="contact_bulk_delete"
     ),
+    path("contacts/<int:pk>/", include(get_model_urls("netbox_dns", "contact"))),
 ]

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/view.py

@@ -1,39 +1,25 @@
-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,
 )
 
 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"))),
 ]

netbox_dns/urls/zone.py

@@ -1,63 +1,25 @@
-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 Zone
 from netbox_dns.views import (
-    ZoneListView,
     ZoneView,
-    ZoneDeleteView,
+    ZoneListView,
     ZoneEditView,
+    ZoneDeleteView,
     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>/", 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},
-    ),
+    path("zones/<int:pk>/", include(get_model_urls("netbox_dns", "zone"))),
 ]

netbox_dns/urls/zone_template.py

@@ -1,21 +1,31 @@
-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 ZoneTemplate
 from netbox_dns.views import (
-    ZoneTemplateListView,
     ZoneTemplateView,
-    ZoneTemplateDeleteView,
+    ZoneTemplateListView,
     ZoneTemplateEditView,
+    ZoneTemplateDeleteView,
     ZoneTemplateBulkImportView,
     ZoneTemplateBulkEditView,
     ZoneTemplateBulkDeleteView,
 )
 
 zonetemplate_urlpatterns = [
+    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
     path("zonetemplates/", ZoneTemplateListView.as_view(), name="zonetemplate_list"),
     path("zonetemplates/add/", ZoneTemplateEditView.as_view(), name="zonetemplate_add"),
+    path(
+        "zonetemplates/<int:pk>/edit/",
+        ZoneTemplateEditView.as_view(),
+        name="zonetemplate_edit",
+    ),
+    path(
+        "zonetemplates/<int:pk>/delete/",
+        ZoneTemplateDeleteView.as_view(),
+        name="zonetemplate_delete",
+    ),
     path(
         "zonetemplates/import/",
         ZoneTemplateBulkImportView.as_view(),
@@ -31,27 +41,7 @@ zonetemplate_urlpatterns = [
         ZoneTemplateBulkDeleteView.as_view(),
         name="zonetemplate_bulk_delete",
     ),
-    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
-    path(
-        "zonetemplates/<int:pk>/delete/",
-        ZoneTemplateDeleteView.as_view(),
-        name="zonetemplate_delete",
-    ),
-    path(
-        "zonetemplates/<int:pk>/edit/",
-        ZoneTemplateEditView.as_view(),
-        name="zonetemplate_edit",
-    ),
-    path(
-        "zonetemplates/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="zonetemplate_journal",
-        kwargs={"model": ZoneTemplate},
-    ),
     path(
-        "zonetemplates/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="zonetemplate_changelog",
-        kwargs={"model": ZoneTemplate},
+        "zonetemplates/<int:pk>/", include(get_model_urls("netbox_dns", "zonetemplate"))
     ),
 ]

netbox_dns/validators/dns_name.py

@@ -7,6 +7,7 @@ from netbox.plugins.utils import get_plugin_config
 
 __all__ = (
     "validate_fqdn",
+    "validate_rname",
     "validate_generic_name",
     "validate_domain_name",
 )
@@ -57,6 +58,14 @@ def validate_fqdn(name, always_tolerant=False):
         raise ValidationError(f"{name} is not a valid fully qualified DNS host name")
 
 
+def validate_rname(name, always_tolerant=False):
+    label, zone_label = _get_label(always_tolerant=always_tolerant)
+    regex = rf"^(\*|{label})(\\\.{label})*(\.{zone_label}){{2,}}\.?$"
+
+    if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
+        raise ValidationError(f"{name} is not a valid RNAME")
+
+
 def validate_generic_name(
     name, tolerate_leading_underscores=False, always_tolerant=False
 ):

netbox_dns/views/contact.py

@@ -23,7 +23,6 @@ __all__ = (
     "ContactBulkImportView",
     "ContactBulkEditView",
     "ContactBulkDeleteView",
-    "ContactZoneListView",
 )
 
 

netbox_dns/views/nameserver.py

@@ -2,6 +2,7 @@ from dns import name as dns_name
 
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import NameServerFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
@@ -15,15 +16,13 @@ from netbox_dns.tables import NameServerTable, ZoneTable
 
 
 __all__ = (
-    "NameServerListView",
     "NameServerView",
+    "NameServerListView",
     "NameServerEditView",
     "NameServerDeleteView",
     "NameServerBulkEditView",
     "NameServerBulkImportView",
     "NameServerBulkDeleteView",
-    "NameServerZoneListView",
-    "NameServerSOAZoneListView",
 )
 
 
@@ -77,6 +76,11 @@ class NameServerBulkDeleteView(generic.BulkDeleteView):
     table = NameServerTable
 
 
+@register_model_view(NameServer, "contacts")
+class NameServerContactsView(ObjectContactsView):
+    queryset = NameServer.objects.all()
+
+
 @register_model_view(NameServer, "zones")
 class NameServerZoneListView(generic.ObjectChildrenView):
     queryset = NameServer.objects.all().prefetch_related("zones")