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

netbox_dns/__init__.py

@@ -1,6 +1,6 @@
 from netbox.plugins import PluginConfig
 
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 
 class DNSConfig(PluginConfig):

netbox_dns/api/nested_serializers.py

@@ -59,6 +59,22 @@ class NestedZoneSerializer(WritableNestedSerializer):
         ]
 
 
+class NestedZoneTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
+    )
+
+    class Meta:
+        model = ZoneTemplate
+        fields = (
+            "id",
+            "url",
+            "name",
+            "display",
+            "description",
+        )
+
+
 class NestedRecordSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:record-detail"
@@ -86,6 +102,7 @@ class NestedRecordSerializer(WritableNestedSerializer):
             "status",
             "ttl",
             "zone",
+            "managed",
             "active",
         ]
 
@@ -109,19 +126,3 @@ class NestedRecordTemplateSerializer(WritableNestedSerializer):
             "ttl",
             "description",
         )
-
-
-class NestedZoneTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
-    )
-
-    class Meta:
-        model = ZoneTemplate
-        fields = (
-            "id",
-            "url",
-            "name",
-            "display",
-            "description",
-        )

netbox_dns/api/serializers_/record.py

@@ -87,5 +87,6 @@ class RecordSerializer(NetBoxModelSerializer):
             "status",
             "ttl",
             "description",
+            "managed",
             "active",
         )

netbox_dns/api/views.py

@@ -1,6 +1,4 @@
 from rest_framework import serializers
-from rest_framework.decorators import action
-from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 
 from netbox.api.viewsets import NetBoxModelViewSet
@@ -47,12 +45,6 @@ class ViewViewSet(NetBoxModelViewSet):
     serializer_class = ViewSerializer
     filterset_class = ViewFilterSet
 
-    @action(detail=True, methods=["get"])
-    def views(self, request, pk=None):
-        views = View.objects.filter(zone=pk)
-        serializer = ViewSerializer(views, many=True, context={"request": request})
-        return Response(serializer.data)
-
 
 class ZoneViewSet(NetBoxModelViewSet):
     queryset = Zone.objects.prefetch_related(
@@ -66,32 +58,12 @@ class ZoneViewSet(NetBoxModelViewSet):
     serializer_class = ZoneSerializer
     filterset_class = ZoneFilterSet
 
-    @action(detail=True, methods=["get"])
-    def records(self, request, pk=None):
-        records = Record.objects.filter(zone=pk)
-        serializer = RecordSerializer(records, many=True, context={"request": request})
-        return Response(serializer.data)
-
-    @action(detail=True, methods=["get"])
-    def nameservers(self, request, pk=None):
-        nameservers = NameServer.objects.filter(zones__id=pk)
-        serializer = NameServerSerializer(
-            nameservers, many=True, context={"request": request}
-        )
-        return Response(serializer.data)
-
 
 class NameServerViewSet(NetBoxModelViewSet):
     queryset = NameServer.objects.prefetch_related("zones", "tenant")
     serializer_class = NameServerSerializer
     filterset_class = NameServerFilterSet
 
-    @action(detail=True, methods=["get"])
-    def zones(self, request, pk=None):
-        zones = Zone.objects.filter(nameservers__id=pk)
-        serializer = ZoneSerializer(zones, many=True, context={"request": request})
-        return Response(serializer.data)
-
 
 class RecordViewSet(NetBoxModelViewSet):
     queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")

netbox_dns/filtersets/record.py

@@ -121,7 +121,7 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         if not value.strip():
             return queryset
         qs_filter = (
-            Q(name__icontains=value)
+            Q(fqdn__icontains=value)
             | Q(value__icontains=value)
             | Q(zone__name__icontains=value)
         )

netbox_dns/graphql/schema.py

@@ -25,79 +25,55 @@ from .types import (
 )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSNameServerQuery:
-    @strawberry.field
-    def netbox_dns_nameserver(self, id: int) -> NetBoxDNSNameServerType:
-        return NameServer.objects.get(pk=id)
-
+    netbox_dns_nameserver: NetBoxDNSNameServerType = strawberry_django.field()
     netbox_dns_nameserver_list: List[NetBoxDNSNameServerType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSViewQuery:
-    @strawberry.field
-    def netbox_dns_view(self, id: int) -> NetBoxDNSViewType:
-        return View.objects.get(pk=id)
-
+    netbox_dns_view: NetBoxDNSViewType = strawberry_django.field()
     netbox_dns_view_list: List[NetBoxDNSViewType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSZoneQuery:
-    @strawberry.field
-    def netbox_dns_zone(self, id: int) -> NetBoxDNSZoneType:
-        return Zone.objects.get(pk=id)
-
+    netbox_dns_zone: NetBoxDNSZoneType = strawberry_django.field()
     netbox_dns_zone_list: List[NetBoxDNSZoneType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRecordQuery:
-    @strawberry.field
-    def netbox_dns_record(self, id: int) -> NetBoxDNSRecordType:
-        return Record.objects.get(pk=id)
-
+    netbox_dns_record: NetBoxDNSRecordType = strawberry_django.field()
     netbox_dns_record_list: List[NetBoxDNSRecordType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSContactQuery:
-    @strawberry.field
-    def netbox_dns_contact(self, id: int) -> NetBoxDNSContactType:
-        return Contact.objects.get(pk=id)
-
+    netbox_dns_contact: NetBoxDNSContactType = strawberry_django.field()
     netbox_dns_contact_list: List[NetBoxDNSContactType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRegistrarQuery:
-    @strawberry.field
-    def netbox_dns_registrar(self, id: int) -> NetBoxDNSRegistrarType:
-        return Registrar.objects.get(pk=id)
-
+    netbox_dns_registrar: NetBoxDNSRegistrarType = strawberry_django.field()
     netbox_dns_registrar_list: List[NetBoxDNSRegistrarType] = strawberry_django.field()
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSZoneTemplateQuery:
-    @strawberry.field
-    def netbox_dns_zone_template(self, id: int) -> NetBoxDNSZoneTemplateType:
-        return ZoneTemplate.objects.get(pk=id)
-
+    netbox_dns_zone_template: NetBoxDNSZoneTemplateType = strawberry_django.field()
     netbox_dns_zone_template_list: List[NetBoxDNSZoneTemplateType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type
+@strawberry.type(name="Query")
 class NetBoxDNSRecordTemplateQuery:
-    @strawberry.field
-    def netbox_dns_record_template(self, id: int) -> NetBoxDNSRecordTemplateType:
-        return RecordTemplate.objects.get(pk=id)
-
+    netbox_dns_record_template: NetBoxDNSRecordTemplateType = strawberry_django.field()
     netbox_dns_record_template_list: List[NetBoxDNSRecordTemplateType] = (
         strawberry_django.field()
     )

netbox_dns/migrations/0007_alter_ordering_options.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.0.7 on 2024-08-27 09:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0006_templating"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="record",
+            options={"ordering": ("fqdn", "zone", "name", "type", "value", "status")},
+        ),
+        migrations.AlterModelOptions(
+            name="recordtemplate",
+            options={"ordering": ("name",)},
+        ),
+        migrations.AlterModelOptions(
+            name="zonetemplate",
+            options={"ordering": ("name",)},
+        ),
+    ]

netbox_dns/models/contact.py

@@ -87,7 +87,7 @@ class Contact(NetBoxModel):
         related_name="netbox_dns_contact_set",
     )
 
-    clone_fields = [
+    clone_fields = (
         "name",
         "description",
         "organization",
@@ -102,7 +102,7 @@ class Contact(NetBoxModel):
         "fax_ext",
         "email",
         "tags",
-    ]
+    )
 
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:contact", kwargs={"pk": self.pk})
@@ -114,7 +114,13 @@ class Contact(NetBoxModel):
         return self.contact_id
 
     class Meta:
-        ordering = ("name", "contact_id")
+        verbose_name = "Contact"
+        verbose_name_plural = "Contacts"
+
+        ordering = (
+            "name",
+            "contact_id",
+        )
 
     @property
     def zones(self):

netbox_dns/models/nameserver.py

@@ -7,6 +7,7 @@ from django.urls import reverse
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
+from netbox.models.features import ContactsMixin
 
 from netbox_dns.utilities import (
     name_to_unicode,
@@ -26,7 +27,7 @@ __all__ = (
 )
 
 
-class NameServer(ObjectModificationMixin, NetBoxModel):
+class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -43,13 +44,17 @@ class NameServer(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     class Meta:
-        ordering = ("name",)
         verbose_name = "Nameserver"
         verbose_name_plural = "Nameservers"
 
+        ordering = ("name",)
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()

netbox_dns/models/record.py

@@ -9,6 +9,7 @@ from django.db.models import Q, ExpressionWrapper, BooleanField, Min
 from django.urls import reverse
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -62,7 +63,7 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Record(ObjectModificationMixin, NetBoxModel):
+class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -155,7 +156,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
     objects = RecordManager()
     raw_objects = RestrictedQuerySet.as_manager()
 
-    clone_fields = [
+    clone_fields = (
         "zone",
         "type",
         "name",
@@ -164,10 +165,20 @@ class Record(ObjectModificationMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
-    ]
+    )
 
     class Meta:
-        ordering = ("zone", "name", "type", "value", "status")
+        verbose_name = "Record"
+        verbose_name_plural = "Records"
+
+        ordering = (
+            "fqdn",
+            "zone",
+            "name",
+            "type",
+            "value",
+            "status",
+        )
 
     def __str__(self):
         try:

netbox_dns/models/record_template.py

@@ -85,7 +85,10 @@ class RecordTemplate(NetBoxModel):
     )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Record Template"
+        verbose_name_plural = "Record Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/registrar.py

@@ -59,7 +59,13 @@ class Registrar(NetBoxModel):
         return str(self.name)
 
     class Meta:
-        ordering = ("name", "iana_id")
+        verbose_name = "Registrar"
+        verbose_name_plural = "Registrars"
+
+        ordering = (
+            "name",
+            "iana_id",
+        )
 
 
 @register_search

netbox_dns/models/view.py

@@ -3,6 +3,7 @@ from django.urls import reverse
 from django.core.exceptions import ValidationError
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.context import current_request
 from utilities.exceptions import AbortRequest
@@ -16,7 +17,7 @@ __all__ = (
 )
 
 
-class View(ObjectModificationMixin, NetBoxModel):
+class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -36,7 +37,10 @@ class View(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     @classmethod
     def get_default_view(cls):
@@ -49,6 +53,9 @@ class View(ObjectModificationMixin, NetBoxModel):
         return str(self.name)
 
     class Meta:
+        verbose_name = "View"
+        verbose_name_plural = "Views"
+
         ordering = ("name",)
 
     def delete(self, *args, **kwargs):

netbox_dns/models/zone.py

@@ -19,6 +19,7 @@ from django.dispatch import receiver
 from django.conf import settings
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -34,6 +35,7 @@ from netbox_dns.utilities import (
 )
 from netbox_dns.validators import (
     validate_fqdn,
+    validate_rname,
     validate_domain_name,
 )
 from netbox_dns.mixins import ObjectModificationMixin
@@ -66,7 +68,7 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Zone(ObjectModificationMixin, NetBoxModel):
+class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (ZoneStatusChoices.STATUS_ACTIVE,)
 
     def __init__(self, *args, **kwargs):
@@ -245,7 +247,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
 
     objects = ZoneManager()
 
-    clone_fields = [
+    clone_fields = (
         "view",
         "name",
         "status",
@@ -259,9 +261,12 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         "soa_expire",
         "soa_minimum",
         "description",
-    ]
+    )
 
     class Meta:
+        verbose_name = "Zone"
+        verbose_name_plural = "Zones"
+
         ordering = (
             "view",
             "name",
@@ -618,7 +623,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             raise ValidationError("soa_rname not set and no default value defined")
         try:
             dns_name.from_text(self.soa_rname, origin=dns_name.root)
-            validate_fqdn(self.soa_rname)
+            validate_rname(self.soa_rname)
         except (DNSException, ValidationError) as exc:
             raise ValidationError(
                 {
@@ -638,7 +643,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             old_zone = Zone.objects.get(pk=self.pk)
             if not self.soa_serial_auto:
                 self.check_soa_serial_increment(old_zone.soa_serial, self.soa_serial)
-            else:
+            elif not old_zone.soa_serial_auto:
                 try:
                     self.check_soa_serial_increment(
                         old_zone.soa_serial, self.get_auto_serial()

netbox_dns/models/zone_template.py

@@ -82,7 +82,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
 
-    clone_fields = [
+    clone_fields = (
         "description",
         "nameservers",
         "record_templates",
@@ -92,19 +92,22 @@ class ZoneTemplate(NetBoxModel):
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
-    template_fields = [
+    template_fields = (
         "tenant",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Zone Template"
+        verbose_name_plural = "Zone Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/tables/contact.py

@@ -19,7 +19,6 @@ class ContactTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = Contact
         fields = (
-            "contact_id",
             "name",
             "description",
             "organization",

netbox_dns/tables/nameserver.py

@@ -22,13 +22,7 @@ class NameServerTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = NameServer
-        fields = (
-            "name",
-            "description",
-            "tags",
-            "tenant",
-            "tenant_group",
-        )
+        fields = ("description",)
         default_columns = (
             "name",
             "tags",

netbox_dns/tables/record.py

@@ -23,10 +23,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 }}",
     )
@@ -65,20 +73,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",
@@ -104,17 +100,7 @@ class ManagedRecordTable(RecordBaseTable):
 
     class Meta(NetBoxTable.Meta):
         model = Record
-        fields = (
-            "name",
-            "zone",
-            "ttl",
-            "type",
-            "value",
-            "unicode_value",
-            "address_record",
-            "ipam_ip_address",
-            "active",
-        )
+        fields = ()
         default_columns = (
             "name",
             "zone",
@@ -130,13 +116,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")