netbox-plugin-dns 1.1.7__py3-none-any.whl → 1.2.0__py3-none-any.whl

netbox_dns/__init__.py

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.7"
+__version__ = "1.2.0"
 
 
 def _check_list(setting):
@@ -19,8 +19,7 @@ class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = _("NetBox DNS")
     description = _("NetBox plugin for DNS data")
-    min_version = "4.0.0"
-    max_version = "4.1.99"
+    min_version = "4.2.0"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"
@@ -50,7 +49,6 @@ class DNSConfig(PluginConfig):
         "dnssync_minimum_zone_labels": 2,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
-        "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0
         "tolerate_leading_underscore_types": [
             RecordTypeChoices.CNAME,
             RecordTypeChoices.DNAME,
@@ -82,6 +80,13 @@ class DNSConfig(PluginConfig):
         ):
             _check_list(setting)
 
+        # +
+        # TODO: Remove this workaround as soon as it's no longer required
+        #
+        # Force loading views so the register_model_view is run for all views
+        # -
+        import netbox_dns.views  # noqa: F401
+
 
 #
 # Initialize plugin config

netbox_dns/filtersets/zone.py

@@ -29,20 +29,6 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("View"),
     )
-    # DEPRECATED: Remove in 1.1
-    name_server_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=NameServer.objects.all(),
-        field_name="nameservers",
-        to_field_name="id",
-        label=_("Nameserver IDs"),
-    )
-    # DEPRECATED: Remove in 1.1
-    name_server = django_filters.ModelMultipleChoiceFilter(
-        queryset=NameServer.objects.all(),
-        field_name="nameservers__name",
-        to_field_name="name",
-        label=_("Nameservers"),
-    )
     nameserver_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",

netbox_dns/migrations/0012_natural_ordering.py

@@ -0,0 +1,88 @@
+# Generated by Django 5.1.3 on 2024-12-02 16:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0011_rename_related_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="nameserver",
+            name="name",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=255, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="record",
+            name="fqdn",
+            field=models.CharField(
+                blank=True,
+                db_collation="natural_sort",
+                default=None,
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="record",
+            name="name",
+            field=models.CharField(db_collation="natural_sort", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="recordtemplate",
+            name="name",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=200, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="recordtemplate",
+            name="record_name",
+            field=models.CharField(db_collation="natural_sort", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="registrar",
+            name="name",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=255, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registrationcontact",
+            name="contact_id",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=50, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="registrationcontact",
+            name="name",
+            field=models.CharField(
+                blank=True, db_collation="natural_sort", max_length=100
+            ),
+        ),
+        migrations.AlterField(
+            model_name="view",
+            name="name",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=255, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="zone",
+            name="name",
+            field=models.CharField(db_collation="natural_sort", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="zonetemplate",
+            name="name",
+            field=models.CharField(
+                db_collation="natural_sort", max_length=200, unique=True
+            ),
+        ),
+    ]

netbox_dns/models/nameserver.py

@@ -31,6 +31,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("Name"),
         unique=True,
         max_length=255,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/models/record.py

@@ -119,6 +119,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         verbose_name=_("Name"),
         max_length=255,
+        db_collation="natural_sort",
     )
     zone = models.ForeignKey(
         verbose_name=_("Zone"),
@@ -132,6 +133,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
         blank=True,
         default=None,
+        db_collation="natural_sort",
     )
     type = models.CharField(
         verbose_name=_("Type"),

netbox_dns/models/record_template.py

@@ -27,10 +27,12 @@ class RecordTemplate(NetBoxModel):
         verbose_name=_("Template Name"),
         unique=True,
         max_length=200,
+        db_collation="natural_sort",
     )
     record_name = models.CharField(
         verbose_name=_("Name"),
         max_length=255,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/models/registrar.py

@@ -20,6 +20,7 @@ class Registrar(NetBoxModel):
         verbose_name=_("Name"),
         unique=True,
         max_length=255,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/models/registration_contact.py

@@ -22,11 +22,13 @@ class RegistrationContact(NetBoxModel):
         verbose_name=_("Contact ID"),
         max_length=50,
         unique=True,
+        db_collation="natural_sort",
     )
     name = models.CharField(
         verbose_name=_("Name"),
         blank=True,
         max_length=100,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/models/view.py

@@ -30,6 +30,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         verbose_name=_("Name"),
         unique=True,
         max_length=255,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/models/zone.py

@@ -94,6 +94,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         verbose_name=_("Name"),
         max_length=255,
+        db_collation="natural_sort",
     )
     status = models.CharField(
         verbose_name=_("Status"),

netbox_dns/models/zone_template.py

@@ -17,6 +17,7 @@ class ZoneTemplate(NetBoxModel):
         verbose_name=_("Template Name"),
         unique=True,
         max_length=200,
+        db_collation="natural_sort",
     )
     description = models.CharField(
         verbose_name=_("Description"),

netbox_dns/navigation.py

@@ -18,7 +18,7 @@ view_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_view"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:view_import",
+            "plugins:netbox_dns:view_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_view"],
@@ -38,7 +38,7 @@ zone_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_zone"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:zone_import",
+            "plugins:netbox_dns:zone_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_zone"],
@@ -58,7 +58,7 @@ nameserver_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_nameserver"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:nameserver_import",
+            "plugins:netbox_dns:nameserver_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_nameserver"],
@@ -78,7 +78,7 @@ record_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_record"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:record_import",
+            "plugins:netbox_dns:record_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_record"],
@@ -87,7 +87,7 @@ record_menu_item = PluginMenuItem(
 )
 
 managed_record_menu_item = PluginMenuItem(
-    link="plugins:netbox_dns:managed_record_list",
+    link="plugins:netbox_dns:record_list_managed",
     link_text=_("Managed Records"),
     permissions=["netbox_dns.view_record"],
 )
@@ -104,7 +104,7 @@ zonetemplate_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_zonetemplate"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:zonetemplate_import",
+            "plugins:netbox_dns:zonetemplate_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_zonetemplate"],
@@ -124,7 +124,7 @@ recordtemplate_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_recordtemplate"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:recordtemplate_import",
+            "plugins:netbox_dns:recordtemplate_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_recordtemplate"],
@@ -144,7 +144,7 @@ registrar_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_registrar"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:registrar_import",
+            "plugins:netbox_dns:registrar_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_registrar"],
@@ -164,7 +164,7 @@ contact_menu_item = PluginMenuItem(
             permissions=["netbox_dns.add_registrationcontact"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:registrationcontact_import",
+            "plugins:netbox_dns:registrationcontact_bulk_import",
             _("Import"),
             "mdi mdi-upload",
             permissions=["netbox_dns.add_registrationcontact"],

netbox_dns/signals/ipam_dnssync.py

@@ -11,7 +11,6 @@ from netbox.signals import post_clean
 from ipam.models import IPAddress, Prefix
 from utilities.exceptions import AbortRequest
 
-from netbox_dns.models import view as _view
 from netbox_dns.utilities import (
     check_dns_records,
     check_record_permission,
@@ -203,26 +202,9 @@ def ipam_dnssync_prefix_pre_delete(instance, **kwargs):
         update_dns_records(ip_address)
 
 
-@receiver(m2m_changed, sender=_view.View.prefixes.through)
+@receiver(m2m_changed, sender=Prefix.netbox_dns_views.through)
 def ipam_dnssync_view_prefix_changed(**kwargs):
     action = kwargs.get("action")
-    request = current_request.get()
-
-    # +
-    # Handle all post_add and post_remove signals except the ones directly
-    # handled by the pre_delete handler for the Prefix model.
-    #
-    # Yes. This IS ugly.
-    # -
-    if action not in ("post_add", "post_remove") or (
-        request is not None
-        and action == "post_remove"
-        and (
-            request.path.startswith("/ipam/prefixes/")
-            or request.path.startswith("/api/ipam/prefixes/")
-        )
-    ):
-        return
 
     check_view = action != "post_remove"
 

netbox_dns/template_content.py

@@ -15,7 +15,7 @@ from netbox_dns.utilities import get_views_by_prefix
 
 
 class RelatedDNSRecords(PluginTemplateExtension):
-    model = "ipam.ipaddress"
+    models = ("ipam.ipaddress",)
 
     def right_page(self):
         ip_address = self.context.get("object")
@@ -51,7 +51,7 @@ class RelatedDNSRecords(PluginTemplateExtension):
 
 
 class RelatedDNSViews(PluginTemplateExtension):
-    model = "ipam.prefix"
+    models = ("ipam.prefix",)
 
     def right_page(self):
         prefix = self.context.get("object")
@@ -73,7 +73,7 @@ class RelatedDNSViews(PluginTemplateExtension):
             "netbox_dns/view/button.html",
             extra_context={
                 "url": reverse(
-                    "plugins:netbox_dns:prefix_views",
+                    "ipam:prefix_views",
                     kwargs={"pk": self.context.get("object").pk},
                 ),
             },
@@ -81,7 +81,7 @@ class RelatedDNSViews(PluginTemplateExtension):
 
 
 class IPRelatedDNSRecords(PluginTemplateExtension):
-    model = "ipam.ipaddress"
+    models = ("ipam.ipaddress",)
 
     def right_page(self):
         ip_address = self.context.get("object")

netbox_dns/templates/netbox_dns/record.html

@@ -15,7 +15,7 @@
 {% block breadcrumbs %}
 {% if object.managed %}
 <li class="breadcrumb-item">
-    <a href="{% url 'plugins:netbox_dns:managed_record_list' %}">{% trans "Managed Records" %}</a>
+    <a href="{% url 'plugins:netbox_dns:record_list_managed' %}">{% trans "Managed Records" %}</a>
 </li>
 {% else %}
 {{ block.super }}

netbox_dns/urls.py

@@ -0,0 +1,72 @@
+from django.urls import include, path
+
+from utilities.urls import get_model_urls
+
+app_name = "netbox_dns"
+
+urlpatterns = (
+    path(
+        "nameservers/",
+        include(get_model_urls("netbox_dns", "nameserver", detail=False)),
+    ),
+    path(
+        "nameservers/<int:pk>/",
+        include(get_model_urls("netbox_dns", "nameserver")),
+    ),
+    path(
+        "recordtemplates/",
+        include(get_model_urls("netbox_dns", "recordtemplate", detail=False)),
+    ),
+    path(
+        "recordtemplates/<int:pk>/",
+        include(get_model_urls("netbox_dns", "recordtemplate")),
+    ),
+    path(
+        "records/",
+        include(get_model_urls("netbox_dns", "record", detail=False)),
+    ),
+    path(
+        "records/<int:pk>/",
+        include(get_model_urls("netbox_dns", "record")),
+    ),
+    path(
+        "registrars",
+        include(get_model_urls("netbox_dns", "registrar", detail=False)),
+    ),
+    path(
+        "registrars/<int:pk>/",
+        include(get_model_urls("netbox_dns", "registrar")),
+    ),
+    path(
+        "registrationcontacts/",
+        include(get_model_urls("netbox_dns", "registrationcontact", detail=False)),
+    ),
+    path(
+        "registrationcontacts/<int:pk>/",
+        include(get_model_urls("netbox_dns", "registrationcontact")),
+    ),
+    path(
+        "views/",
+        include(get_model_urls("netbox_dns", "view", detail=False)),
+    ),
+    path(
+        "views/<int:pk>/",
+        include(get_model_urls("netbox_dns", "view")),
+    ),
+    path(
+        "zonetemplates/",
+        include(get_model_urls("netbox_dns", "zonetemplate", detail=False)),
+    ),
+    path(
+        "zonetemplates/<int:pk>/",
+        include(get_model_urls("netbox_dns", "zonetemplate")),
+    ),
+    path(
+        "zones/",
+        include(get_model_urls("netbox_dns", "zone", detail=False)),
+    ),
+    path(
+        "zones/<int:pk>/",
+        include(get_model_urls("netbox_dns", "zone")),
+    ),
+)

netbox_dns/views/nameserver.py

@@ -28,6 +28,7 @@ __all__ = (
 )
 
 
+@register_model_view(NameServer, "list", path="", detail=False)
 class NameServerListView(generic.ObjectListView):
     queryset = NameServer.objects.all()
     filterset = NameServerFilterSet
@@ -35,6 +36,7 @@ class NameServerListView(generic.ObjectListView):
     table = NameServerTable
 
 
+@register_model_view(NameServer)
 class NameServerView(generic.ObjectView):
     queryset = NameServer.objects.prefetch_related("zones")
 
@@ -48,17 +50,21 @@ class NameServerView(generic.ObjectView):
         return {}
 
 
+@register_model_view(NameServer, "add", detail=False)
+@register_model_view(NameServer, "edit")
 class NameServerEditView(generic.ObjectEditView):
     queryset = NameServer.objects.all()
     form = NameServerForm
     default_return_url = "plugins:netbox_dns:nameserver_list"
 
 
+@register_model_view(NameServer, "delete")
 class NameServerDeleteView(generic.ObjectDeleteView):
     queryset = NameServer.objects.all()
     default_return_url = "plugins:netbox_dns:nameserver_list"
 
 
+@register_model_view(NameServer, "bulk_import", detail=False)
 class NameServerBulkImportView(generic.BulkImportView):
     queryset = NameServer.objects.all()
     model_form = NameServerImportForm
@@ -66,6 +72,7 @@ class NameServerBulkImportView(generic.BulkImportView):
     default_return_url = "plugins:netbox_dns:nameserver_list"
 
 
+@register_model_view(NameServer, "bulk_edit", path="edit", detail=False)
 class NameServerBulkEditView(generic.BulkEditView):
     queryset = NameServer.objects.all()
     filterset = NameServerFilterSet
@@ -73,6 +80,7 @@ class NameServerBulkEditView(generic.BulkEditView):
     form = NameServerBulkEditForm
 
 
+@register_model_view(NameServer, "bulk_delete", path="delete", detail=False)
 class NameServerBulkDeleteView(generic.BulkDeleteView):
     queryset = NameServer.objects.all()
     table = NameServerTable

netbox_dns/views/record.py

@@ -35,6 +35,7 @@ class CNAMEWarning(Exception):
     pass
 
 
+@register_model_view(Record, "list", path="", detail=False)
 class RecordListView(generic.ObjectListView):
     queryset = Record.objects.filter(managed=False).prefetch_related(
         "zone", "ptr_record"
@@ -44,6 +45,7 @@ class RecordListView(generic.ObjectListView):
     table = RecordTable
 
 
+@register_model_view(Record, "list_managed", path="managed", detail=False)
 class ManagedRecordListView(generic.ObjectListView):
     queryset = Record.objects.filter(managed=True).prefetch_related(
         "ipam_ip_address", "address_record"
@@ -55,6 +57,7 @@ class ManagedRecordListView(generic.ObjectListView):
     template_name = "netbox_dns/record/managed.html"
 
 
+@register_model_view(Record)
 class RecordView(generic.ObjectView):
     queryset = Record.objects.prefetch_related("zone", "ptr_record")
 
@@ -158,6 +161,8 @@ class RecordView(generic.ObjectView):
         return context
 
 
+@register_model_view(Record, "add", detail=False)
+@register_model_view(Record, "edit")
 class RecordEditView(generic.ObjectEditView):
     queryset = Record.objects.filter(managed=False).prefetch_related(
         "zone", "ptr_record"
@@ -166,11 +171,13 @@ class RecordEditView(generic.ObjectEditView):
     default_return_url = "plugins:netbox_dns:record_list"
 
 
+@register_model_view(Record, "delete")
 class RecordDeleteView(generic.ObjectDeleteView):
     queryset = Record.objects.filter(managed=False)
     default_return_url = "plugins:netbox_dns:record_list"
 
 
+@register_model_view(Record, "bulk_import", detail=False)
 class RecordBulkImportView(generic.BulkImportView):
     queryset = Record.objects.filter(managed=False).prefetch_related(
         "zone", "ptr_record"
@@ -180,6 +187,7 @@ class RecordBulkImportView(generic.BulkImportView):
     default_return_url = "plugins:netbox_dns:record_list"
 
 
+@register_model_view(Record, "bulk_edit", path="edit", detail=False)
 class RecordBulkEditView(generic.BulkEditView):
     queryset = Record.objects.filter(managed=False).prefetch_related("zone")
     filterset = RecordFilterSet
@@ -187,6 +195,7 @@ class RecordBulkEditView(generic.BulkEditView):
     form = RecordBulkEditForm
 
 
+@register_model_view(Record, "bulk_delete", path="delete", detail=False)
 class RecordBulkDeleteView(generic.BulkDeleteView):
     queryset = Record.objects.filter(managed=False)
     table = RecordTable

netbox_dns/views/record_template.py

@@ -1,6 +1,7 @@
 from dns import name as dns_name
 
 from netbox.views import generic
+from utilities.views import register_model_view
 
 from netbox_dns.filtersets import RecordTemplateFilterSet
 from netbox_dns.forms import (
@@ -25,6 +26,7 @@ __all__ = (
 )
 
 
+@register_model_view(RecordTemplate, "list", path="", detail=False)
 class RecordTemplateListView(generic.ObjectListView):
     queryset = RecordTemplate.objects.all()
     filterset = RecordTemplateFilterSet
@@ -32,6 +34,7 @@ class RecordTemplateListView(generic.ObjectListView):
     table = RecordTemplateTable
 
 
+@register_model_view(RecordTemplate)
 class RecordTemplateView(generic.ObjectView):
     queryset = RecordTemplate.objects.all()
 
@@ -54,17 +57,21 @@ class RecordTemplateView(generic.ObjectView):
         return context
 
 
+@register_model_view(RecordTemplate, "add", detail=False)
+@register_model_view(RecordTemplate, "edit")
 class RecordTemplateEditView(generic.ObjectEditView):
     queryset = RecordTemplate.objects.all()
     form = RecordTemplateForm
     default_return_url = "plugins:netbox_dns:recordtemplate_list"
 
 
+@register_model_view(RecordTemplate, "delete")
 class RecordTemplateDeleteView(generic.ObjectDeleteView):
     queryset = RecordTemplate.objects.all()
     default_return_url = "plugins:netbox_dns:recordtemplate_list"
 
 
+@register_model_view(RecordTemplate, "bulk_import", detail=False)
 class RecordTemplateBulkImportView(generic.BulkImportView):
     queryset = RecordTemplate.objects.all()
     model_form = RecordTemplateImportForm
@@ -72,6 +79,7 @@ class RecordTemplateBulkImportView(generic.BulkImportView):
     default_return_url = "plugins:netbox_dns:recordtemplate_list"
 
 
+@register_model_view(RecordTemplate, "bulk_edit", path="edit", detail=False)
 class RecordTemplateBulkEditView(generic.BulkEditView):
     queryset = RecordTemplate.objects.all()
     filterset = RecordTemplateFilterSet
@@ -79,6 +87,7 @@ class RecordTemplateBulkEditView(generic.BulkEditView):
     form = RecordTemplateBulkEditForm
 
 
+@register_model_view(RecordTemplate, "bulk_delete", path="delete", detail=False)
 class RecordTemplateBulkDeleteView(generic.BulkDeleteView):
     queryset = RecordTemplate.objects.all()
     table = RecordTemplateTable