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

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,25 +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,
+    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(
+        "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},
+    ),
 ]

netbox_dns/urls/zone_template.py

@@ -1,31 +1,21 @@
-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 ZoneTemplate
 from netbox_dns.views import (
-    ZoneTemplateView,
     ZoneTemplateListView,
-    ZoneTemplateEditView,
+    ZoneTemplateView,
     ZoneTemplateDeleteView,
+    ZoneTemplateEditView,
     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(),
@@ -41,7 +31,27 @@ 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>/", include(get_model_urls("netbox_dns", "zonetemplate"))
+        "zonetemplates/<int:pk>/changelog/",
+        ObjectChangeLogView.as_view(),
+        name="zonetemplate_changelog",
+        kwargs={"model": ZoneTemplate},
     ),
 ]

netbox_dns/utilities/__init__.py

@@ -1,74 +1,2 @@
-import re
-
-from dns import name as dns_name
-from dns.exception import DNSException
-from netaddr import IPNetwork, AddrFormatError
-
-from netbox.plugins.utils import get_plugin_config
-
-
-class NameFormatError(Exception):
-    pass
-
-
-def arpa_to_prefix(arpa_name):
-    name = arpa_name.rstrip(".")
-
-    if name.endswith(".in-addr.arpa"):
-        address = ".".join(reversed(name.replace(".in-addr.arpa", "").split(".")))
-        mask = len(address.split(".")) * 8
-        address = address + (32 - mask) // 8 * ".0"
-
-        try:
-            return IPNetwork(f"{address}/{mask}")
-        except (AddrFormatError, ValueError):
-            return None
-
-    elif name.endswith("ip6.arpa"):
-        address = "".join(reversed(name.replace(".ip6.arpa", "").split(".")))
-        mask = len(address)
-        address = address + "0" * (32 - mask)
-
-        try:
-            return IPNetwork(
-                f"{':'.join([(address[i:i+4]) for i in range(0, 32, 4)])}/{mask*4}"
-            )
-        except AddrFormatError:
-            return None
-
-    else:
-        return None
-
-
-def name_to_unicode(name):
-    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-        return "."
-
-    try:
-        return dns_name.from_text(name, origin=None).to_unicode()
-    except dns_name.IDNAException:
-        return name
-
-
-def value_to_unicode(value):
-    return re.sub(
-        r"xn--[0-9a-z-_.]*",
-        lambda x: name_to_unicode(x.group(0)),
-        value,
-        flags=re.IGNORECASE,
-    )
-
-
-def normalize_name(name):
-    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-        return "."
-
-    try:
-        return (
-            dns_name.from_text(name, origin=dns_name.root)
-            .relativize(dns_name.root)
-            .to_text()
-        )
-
-    except DNSException as exc:
-        raise NameFormatError from exc
+from .conversions import *
+from .ipam_autodns import *

netbox_dns/utilities/conversions.py

@@ -0,0 +1,83 @@
+import re
+
+from dns import name as dns_name
+from dns.exception import DNSException
+from netaddr import IPNetwork, AddrFormatError
+
+from netbox.plugins.utils import get_plugin_config
+
+
+__all__ = (
+    "NameFormatError",
+    "arpa_to_prefix",
+    "name_to_unicode",
+    "value_to_unicode",
+    "normalize_name",
+)
+
+
+class NameFormatError(Exception):
+    pass
+
+
+def arpa_to_prefix(arpa_name):
+    name = arpa_name.rstrip(".")
+
+    if name.endswith(".in-addr.arpa"):
+        address = ".".join(reversed(name.replace(".in-addr.arpa", "").split(".")))
+        mask = len(address.split(".")) * 8
+        address = address + (32 - mask) // 8 * ".0"
+
+        try:
+            return IPNetwork(f"{address}/{mask}")
+        except (AddrFormatError, ValueError):
+            return None
+
+    elif name.endswith("ip6.arpa"):
+        address = "".join(reversed(name.replace(".ip6.arpa", "").split(".")))
+        mask = len(address)
+        address = address + "0" * (32 - mask)
+
+        try:
+            return IPNetwork(
+                f"{':'.join([(address[i:i+4]) for i in range(0, 32, 4)])}/{mask*4}"
+            )
+        except AddrFormatError:
+            return None
+
+    else:
+        return None
+
+
+def name_to_unicode(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
+    try:
+        return dns_name.from_text(name, origin=None).to_unicode()
+    except dns_name.IDNAException:
+        return name
+
+
+def value_to_unicode(value):
+    return re.sub(
+        r"xn--[0-9a-z-_.]*",
+        lambda x: name_to_unicode(x.group(0)),
+        value,
+        flags=re.IGNORECASE,
+    )
+
+
+def normalize_name(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
+    try:
+        return (
+            dns_name.from_text(name, origin=dns_name.root)
+            .relativize(dns_name.root)
+            .to_text()
+        )
+
+    except DNSException as exc:
+        raise NameFormatError from exc