netbox-plugin-dns 0.18.9__py3-none-any.whl → 0.19.0__py3-none-any.whl

netbox_dns/__init__.py

@@ -1,13 +1,13 @@
 from extras.plugins import PluginConfig
 
-__version__ = "0.18.9"
+__version__ = "0.19.0"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
-    min_version = "3.5"
+    min_version = "3.5.8"
     version = __version__
     author = "Peter Eckel"
     author_email = "pe-netbox-plugin-dns@hindenburgring.com"

netbox_dns/api/serializers.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
 
 from netbox.api.serializers import NetBoxModelSerializer
+from tenancy.api.nested_serializers import NestedTenantSerializer
 
 from netbox_dns.api.nested_serializers import (
     NestedViewSerializer,
@@ -15,6 +16,7 @@ class ViewSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:view-detail"
     )
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     class Meta:
         model = View
@@ -28,6 +30,7 @@ class ViewSerializer(NetBoxModelSerializer):
             "created",
             "last_updated",
             "custom_fields",
+            "tenant",
         )
 
 
@@ -56,6 +59,7 @@ class ZoneSerializer(NetBoxModelSerializer):
         read_only=True,
         allow_null=True,
     )
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     def create(self, validated_data):
         nameservers = validated_data.pop("nameservers", None)
@@ -103,6 +107,7 @@ class ZoneSerializer(NetBoxModelSerializer):
             "soa_minimum",
             "active",
             "custom_fields",
+            "tenant",
         )
 
 
@@ -117,6 +122,7 @@ class NameServerSerializer(NetBoxModelSerializer):
         default=None,
         help_text="Zones served by the authoritative nameserver",
     )
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     class Meta:
         model = NameServer
@@ -131,6 +137,7 @@ class NameServerSerializer(NetBoxModelSerializer):
             "created",
             "last_updated",
             "custom_fields",
+            "tenant",
         )
 
 
@@ -161,6 +168,7 @@ class RecordSerializer(NetBoxModelSerializer):
         required=False,
         read_only=True,
     )
+    tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     class Meta:
         model = Record
@@ -184,4 +192,5 @@ class RecordSerializer(NetBoxModelSerializer):
             "address_record",
             "active",
             "custom_fields",
+            "tenant",
         )

netbox_dns/api/views.py

@@ -33,8 +33,13 @@ class ViewViewSet(NetBoxModelViewSet):
 
 
 class ZoneViewSet(NetBoxModelViewSet):
-    queryset = Zone.objects.all().prefetch_related(
-        "view", "nameservers", "tags", "soa_mname", "record_set"
+    queryset = Zone.objects.prefetch_related(
+        "view",
+        "nameservers",
+        "tags",
+        "soa_mname",
+        "record_set",
+        "tenant",
     )
     serializer_class = ZoneSerializer
     filterset_class = ZoneFilter
@@ -55,7 +60,7 @@ class ZoneViewSet(NetBoxModelViewSet):
 
 
 class NameServerViewSet(NetBoxModelViewSet):
-    queryset = NameServer.objects.all().prefetch_related("zones")
+    queryset = NameServer.objects.prefetch_related("zones", "tenant")
     serializer_class = NameServerSerializer
     filterset_class = NameServerFilter
 
@@ -67,7 +72,7 @@ class NameServerViewSet(NetBoxModelViewSet):
 
 
 class RecordViewSet(NetBoxModelViewSet):
-    queryset = Record.objects.all().prefetch_related("zone", "zone__view")
+    queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")
     serializer_class = RecordSerializer
     filterset_class = RecordFilter
 

netbox_dns/filters/nameserver.py

@@ -2,21 +2,17 @@ import django_filters
 from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
+from tenancy.filtersets import TenancyFilterSet
 
 from netbox_dns.models import NameServer
 
 
-class NameServerFilter(NetBoxModelFilterSet):
-    """Filter capabilities for NameServer instances."""
-
-    name = django_filters.CharFilter()
-
+class NameServerFilter(TenancyFilterSet, NetBoxModelFilterSet):
     class Meta:
         model = NameServer
-        fields = ("id", "name")
+        fields = ("id", "name", "tenant")
 
     def search(self, queryset, name, value):
-        """Perform the filtered search."""
         if not value.strip():
             return queryset
         qs_filter = Q(name__icontains=value)

netbox_dns/filters/record.py

@@ -2,11 +2,12 @@ import django_filters
 from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
+from tenancy.filtersets import TenancyFilterSet
 
 from netbox_dns.models import View, Zone, Record, RecordTypeChoices
 
 
-class RecordFilter(NetBoxModelFilterSet):
+class RecordFilter(TenancyFilterSet, NetBoxModelFilterSet):
     """Filter capabilities for Record instances."""
 
     type = django_filters.MultipleChoiceFilter(
@@ -38,7 +39,7 @@ class RecordFilter(NetBoxModelFilterSet):
 
     class Meta:
         model = Record
-        fields = ("id", "type", "name", "value", "status", "zone", "managed")
+        fields = ("id", "type", "name", "value", "status", "zone", "managed", "tenant")
 
     def search(self, queryset, name, value):
         """Perform the filtered search."""

netbox_dns/filters/view.py

@@ -2,21 +2,17 @@ import django_filters
 from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
+from tenancy.filtersets import TenancyFilterSet
 
 from netbox_dns.models import View
 
 
-class ViewFilter(NetBoxModelFilterSet):
-    """Filter capabilities for View instances."""
-
-    name = django_filters.CharFilter()
-
+class ViewFilter(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = View
-        fields = ("id", "name")
+        fields = ("id", "name", "tenant")
 
     def search(self, queryset, name, value):
-        """Perform the filtered search."""
         if not value.strip():
             return queryset
         qs_filter = Q(name__icontains=value)

netbox_dns/filters/zone.py

@@ -2,13 +2,12 @@ import django_filters
 from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
+from tenancy.filtersets import TenancyFilterSet
 
 from netbox_dns.models import View, Zone, ZoneStatusChoices
 
 
-class ZoneFilter(NetBoxModelFilterSet):
-    """Filter capabilities for Zone instances."""
-
+class ZoneFilter(TenancyFilterSet, NetBoxModelFilterSet):
     status = django_filters.ChoiceFilter(
         choices=ZoneStatusChoices,
     )
@@ -28,7 +27,7 @@ class ZoneFilter(NetBoxModelFilterSet):
 
     class Meta:
         model = Zone
-        fields = ("id", "name", "view", "status", "nameservers", "active")
+        fields = ("id", "name", "view", "status", "nameservers", "active", "tenant")
 
     def search(self, queryset, name, value):
         """Perform the filtered search."""

netbox_dns/forms/nameserver.py

@@ -7,15 +7,19 @@ from netbox.forms import (
     NetBoxModelForm,
 )
 
-from utilities.forms.fields import TagFilterField
+from utilities.forms.fields import (
+    TagFilterField,
+    CSVModelChoiceField,
+    DynamicModelChoiceField,
+)
+from tenancy.models import Tenant
+from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import NameServer
 from netbox_dns.utilities import name_to_unicode
 
 
-class NameServerForm(NetBoxModelForm):
-    """Form for creating a new NameServer object."""
-
+class NameServerForm(TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -23,14 +27,17 @@ class NameServerForm(NetBoxModelForm):
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
 
+    fieldsets = (
+        ("Nameserver", ("name", "description", "tags")),
+        ("Tenancy", ("tenant_group", "tenant")),
+    )
+
     class Meta:
         model = NameServer
-        fields = ("name", "description", "tags")
-
+        fields = ("name", "description", "tags", "tenant")
 
-class NameServerFilterForm(NetBoxModelFilterSetForm):
-    """Form for filtering NameServer instances."""
 
+class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = NameServer
 
     name = forms.CharField(
@@ -39,18 +46,36 @@ class NameServerFilterForm(NetBoxModelFilterSetForm):
     )
     tag = TagFilterField(NameServer)
 
+    fieldsets = (
+        (None, ("q", "filter_id", "tag")),
+        ("Attributes", ("name",)),
+        ("Tenant", ("tenant_group_id", "tenant_id")),
+    )
+
 
 class NameServerImportForm(NetBoxModelImportForm):
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        to_field_name="name",
+        required=False,
+        help_text="Assigned tenant",
+    )
+
     class Meta:
         model = NameServer
 
-        fields = ("name", "description")
+        fields = (
+            "name",
+            "description",
+            "tenant",
+        )
 
 
 class NameServerBulkEditForm(NetBoxModelBulkEditForm):
     model = NameServer
 
     description = forms.CharField(max_length=200, required=False)
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     class Meta:
-        nullable_fields = ("description",)
+        nullable_fields = ("description", "tenant")

netbox_dns/forms/record.py

@@ -16,14 +16,14 @@ from utilities.forms.fields import (
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
 from utilities.forms import add_blank_choice
+from tenancy.models import Tenant
+from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import View, Zone, Record, RecordTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
 
 
-class RecordForm(NetBoxModelForm):
-    """Form for creating a new Record object."""
-
+class RecordForm(TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -40,6 +40,24 @@ class RecordForm(NetBoxModelForm):
         label="TTL",
     )
 
+    fieldsets = (
+        (
+            "Record",
+            (
+                "name",
+                "zone",
+                "type",
+                "value",
+                "status",
+                "ttl",
+                "disable_ptr",
+                "description",
+                "tags",
+            ),
+        ),
+        ("Tenancy", ("tenant_group", "tenant")),
+    )
+
     class Meta:
         model = Record
 
@@ -53,13 +71,17 @@ class RecordForm(NetBoxModelForm):
             "disable_ptr",
             "description",
             "tags",
+            "tenant",
         )
 
 
-class RecordFilterForm(NetBoxModelFilterSetForm):
-    """Form for filtering Record instances."""
-
+class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Record
+    fieldsets = (
+        (None, ("q", "filter_id", "tag")),
+        ("Attributes", ("view_id", "zone_id", "name", "value", "status")),
+        ("Tenant", ("tenant_group_id", "tenant_id")),
+    )
 
     type = forms.MultipleChoiceField(
         choices=add_blank_choice(RecordTypeChoices),
@@ -137,6 +159,12 @@ class RecordImportForm(NetBoxModelImportForm):
         label="Disable PTR",
         help_text="Disable generation of a PTR record",
     )
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        to_field_name="name",
+        required=False,
+        help_text="Assigned tenant",
+    )
 
     def is_valid(self):
         try:
@@ -158,6 +186,7 @@ class RecordImportForm(NetBoxModelImportForm):
             "ttl",
             "disable_ptr",
             "description",
+            "tenant",
         )
 
 
@@ -191,11 +220,21 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
         required=False, widget=BulkEditNullBooleanSelect(), label="Disable PTR"
     )
     description = forms.CharField(max_length=200, required=False)
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     fieldsets = (
         (
             None,
-            ("zone", "type", "value", "status", "ttl", "disable_ptr", "description"),
+            (
+                "zone",
+                "type",
+                "value",
+                "status",
+                "ttl",
+                "disable_ptr",
+                "description",
+                "tenant",
+            ),
         ),
     )
-    nullable_fields = ("description", "ttl")
+    nullable_fields = ("description", "ttl", "tenant")

netbox_dns/forms/view.py

@@ -6,21 +6,35 @@ from netbox.forms import (
     NetBoxModelImportForm,
     NetBoxModelForm,
 )
-from utilities.forms.fields import TagFilterField
+from utilities.forms.fields import (
+    TagFilterField,
+    CSVModelChoiceField,
+    DynamicModelChoiceField,
+)
+from tenancy.models import Tenant
+from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import View
 
 
-class ViewForm(NetBoxModelForm):
-    """Form for creating a new View object."""
+class ViewForm(TenancyForm, NetBoxModelForm):
+    fieldsets = (
+        ("View", ("name", "description", "tags")),
+        ("Tenancy", ("tenant_group", "tenant")),
+    )
 
     class Meta:
         model = View
-        fields = ("name", "description", "tags")
+        fields = ("name", "description", "tags", "tenant")
 
 
-class ViewFilterForm(NetBoxModelFilterSetForm):
-    """Form for filtering View instances."""
+class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
+    model = View
+    fieldsets = (
+        (None, ("q", "filter_id", "tag")),
+        ("Attributes", ("name",)),
+        ("Tenant", ("tenant_group_id", "tenant_id")),
+    )
 
     name = forms.CharField(
         required=False,
@@ -28,19 +42,25 @@ class ViewFilterForm(NetBoxModelFilterSetForm):
     )
     tag = TagFilterField(View)
 
-    model = View
-
 
 class ViewImportForm(NetBoxModelImportForm):
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        to_field_name="name",
+        required=False,
+        help_text="Assigned tenant",
+    )
+
     class Meta:
         model = View
-        fields = ("name", "description")
+        fields = ("name", "description", "tenant")
 
 
 class ViewBulkEditForm(NetBoxModelBulkEditForm):
     model = View
 
     description = forms.CharField(max_length=200, required=False)
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     class Meta:
-        nullable_fields = ["description"]
+        nullable_fields = ("description", "tenant")

netbox_dns/forms/zone.py

@@ -19,14 +19,14 @@ from utilities.forms.fields import (
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
 from utilities.forms import add_blank_choice
+from tenancy.models import Tenant
+from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import View, Zone, ZoneStatusChoices, NameServer
 from netbox_dns.utilities import name_to_unicode
 
 
-class ZoneForm(NetBoxModelForm):
-    """Form for creating a new Zone object."""
-
+class ZoneForm(TenancyForm, NetBoxModelForm):
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
@@ -110,6 +110,7 @@ class ZoneForm(NetBoxModelForm):
             ),
         ),
         ("Tags", ("tags",)),
+        ("Tenancy", ("tenant_group", "tenant")),
     )
 
     def __init__(self, *args, **kwargs):
@@ -188,6 +189,7 @@ class ZoneForm(NetBoxModelForm):
             "soa_retry",
             "soa_expire",
             "soa_minimum",
+            "tenant",
         )
         help_texts = {
             "view": "View the zone belongs to",
@@ -195,10 +197,13 @@ class ZoneForm(NetBoxModelForm):
         }
 
 
-class ZoneFilterForm(NetBoxModelFilterSetForm):
-    """Form for filtering Zone instances."""
-
+class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Zone
+    fieldsets = (
+        (None, ("q", "filter_id", "tag")),
+        ("Attributes", ("view_id", "status", "name", "nameservers")),
+        ("Tenant", ("tenant_group_id", "tenant_id")),
+    )
 
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
@@ -280,6 +285,12 @@ class ZoneImportForm(NetBoxModelImportForm):
         required=False,
         help_text="Minimum TTL for negative results, e.g. NXRRSET",
     )
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        to_field_name="name",
+        help_text="Assigned tenant",
+    )
 
     def _get_default_value(self, field):
         _default_values = settings.PLUGINS_CONFIG.get("netbox_dns", {})
@@ -370,6 +381,7 @@ class ZoneImportForm(NetBoxModelImportForm):
             "soa_retry",
             "soa_expire",
             "soa_minimum",
+            "tenant",
         )
 
 
@@ -445,6 +457,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         label="SOA Minimum TTL",
         validators=[MinValueValidator(1)],
     )
+    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     model = Zone
 
@@ -457,6 +470,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
                 "nameservers",
                 "default_ttl",
                 "description",
+                "tenant",
             ),
         ),
         (

netbox_dns/migrations/0024_tenancy.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.4 on 2023-09-17 15:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tenancy", "0011_contactassignment_tags"),
+        ("netbox_dns", "0023_alter_record_value"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="nameserver",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="netbox_dns_nameservers",
+                to="tenancy.tenant",
+            ),
+        ),
+        migrations.AddField(
+            model_name="record",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="netbox_dns_records",
+                to="tenancy.tenant",
+            ),
+        ),
+        migrations.AddField(
+            model_name="view",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="netbox_dns_views",
+                to="tenancy.tenant",
+            ),
+        ),
+        migrations.AddField(
+            model_name="zone",
+            name="tenant",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="netbox_dns_zones",
+                to="tenancy.tenant",
+            ),
+        ),
+    ]

netbox_dns/models.py

@@ -7,6 +7,7 @@ import dns
 from dns import rdata, rdatatype, rdataclass
 from dns import name as dns_name
 from dns.rdtypes.ANY import SOA
+from dns.exception import DNSException
 
 from netaddr import IPNetwork, AddrFormatError, IPAddress
 
@@ -43,7 +44,7 @@ from netbox_dns.validators import (
     validate_extended_hostname,
 )
 
-from extras.plugins import get_plugin_config
+from extras.plugins.utils import get_plugin_config
 
 
 class NameServer(NetBoxModel):
@@ -55,6 +56,13 @@ class NameServer(NetBoxModel):
         max_length=200,
         blank=True,
     )
+    tenant = models.ForeignKey(
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_nameservers",
+        blank=True,
+        null=True,
+    )
 
     clone_fields = ["name", "description"]
 
@@ -259,6 +267,13 @@ class Zone(NetBoxModel):
         blank=True,
         null=True,
     )
+    tenant = models.ForeignKey(
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_zones",
+        blank=True,
+        null=True,
+    )
 
     objects = ZoneManager()
 
@@ -484,6 +499,16 @@ class Zone(NetBoxModel):
                 }
             ) from None
 
+        try:
+            soa_rname = dns_name.from_text(self.soa_rname, origin=dns_name.root)
+            validate_fqdn(self.soa_rname)
+        except (DNSException, ValidationError) as exc:
+            raise ValidationError(
+                {
+                    "soa_rname": exc,
+                }
+            ) from None
+
         if self.soa_serial is None and not self.soa_serial_auto:
             raise ValidationError(
                 {
@@ -691,6 +716,13 @@ class Record(NetBoxModel):
         max_length=200,
         blank=True,
     )
+    tenant = models.ForeignKey(
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_records",
+        blank=True,
+        null=True,
+    )
     ip_address = AddressField(
         verbose_name="Related IP Address",
         help_text="IP address related to an address (A/AAAA) or PTR record",
@@ -1013,6 +1045,13 @@ class View(NetBoxModel):
         max_length=200,
         blank=True,
     )
+    tenant = models.ForeignKey(
+        to="tenancy.Tenant",
+        on_delete=models.PROTECT,
+        related_name="netbox_dns_views",
+        blank=True,
+        null=True,
+    )
 
     clone_fields = ["name", "description"]
 

netbox_dns/tables/nameserver.py

@@ -1,11 +1,12 @@
 import django_tables2 as tables
 
 from netbox.tables import NetBoxTable, TagColumn
+from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import NameServer
 
 
-class NameServerTable(NetBoxTable):
+class NameServerTable(TenancyColumnsMixin, NetBoxTable):
     """Table for displaying NameServer objects."""
 
     name = tables.Column(
@@ -25,6 +26,8 @@ class NameServerTable(NetBoxTable):
             "name",
             "description",
             "tags",
+            "tenant",
+            "tenant_group",
         )
         default_columns = (
             "pk",

netbox_dns/tables/record.py

@@ -7,14 +7,13 @@ from netbox.tables import (
     TagColumn,
     ActionsColumn,
 )
+from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
 
-class RecordBaseTable(NetBoxTable):
-    """Base class for tables displaying Records"""
-
+class RecordBaseTable(TenancyColumnsMixin, NetBoxTable):
     zone = tables.Column(
         linkify=True,
     )
@@ -45,8 +44,6 @@ class RecordBaseTable(NetBoxTable):
 
 
 class RecordTable(RecordBaseTable):
-    """Table for displaying Record objects."""
-
     pk = ToggleColumn()
     status = ChoiceFieldColumn()
     disable_ptr = tables.BooleanColumn(
@@ -76,6 +73,8 @@ class RecordTable(RecordBaseTable):
             "tags",
             "active",
             "description",
+            "tenant",
+            "tenant_group",
         )
         default_columns = (
             "zone",
@@ -89,8 +88,6 @@ class RecordTable(RecordBaseTable):
 
 
 class ManagedRecordTable(RecordBaseTable):
-    """Table for displaying managed Record objects."""
-
     address_record = tables.Column(
         verbose_name="Address Record",
         linkify=True,

netbox_dns/tables/view.py

@@ -1,15 +1,17 @@
 import django_tables2 as tables
 
 from netbox.tables import NetBoxTable
+from tenancy.tables import TenancyColumnsMixin
+
 from netbox_dns.models import View
 
 
-class ViewTable(NetBoxTable):
+class ViewTable(TenancyColumnsMixin, NetBoxTable):
     name = tables.Column(
         linkify=True,
     )
 
     class Meta(NetBoxTable.Meta):
         model = View
-        fields = ("name", "description")
+        fields = ("name", "description", "tenant", "tenant_group")
         default_columns = ("name",)

netbox_dns/tables/zone.py

@@ -6,13 +6,12 @@ from netbox.tables import (
     TagColumn,
     ActionsColumn,
 )
+from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Zone
 
 
-class ZoneTable(NetBoxTable):
-    """Table for displaying Zone objects."""
-
+class ZoneTable(TenancyColumnsMixin, NetBoxTable):
     name = tables.Column(
         linkify=True,
     )
@@ -46,6 +45,8 @@ class ZoneTable(NetBoxTable):
             "soa_mname",
             "soa_rname",
             "soa_serial",
+            "tenant",
+            "tenant_group",
         )
         default_columns = (
             "pk",

netbox_dns/template_content.py

@@ -1,6 +1,7 @@
 from django.db.models.functions import Length
 
-from extras.plugins import PluginTemplateExtension, get_plugin_config
+from extras.plugins.utils import get_plugin_config
+from extras.plugins import PluginTemplateExtension
 
 from netbox_dns.models import Record, RecordTypeChoices, Zone
 from netbox_dns.tables import RelatedRecordTable, RelatedZoneTable

netbox_dns/templates/netbox_dns/nameserver.html

@@ -17,6 +17,15 @@
                                 <td>{{ unicode_name }}</td>
                             </tr>
                         {% endif %}
+                        <tr>
+                            <th scope="row">Tenant</th>
+                            <td>
+                                {% if object.tenant.group %}
+                                    {{ object.tenant.group|linkify }} /
+                                {% endif %}
+                                {{ object.tenant|linkify|placeholder }}
+                            </td>
+                        </tr>
                         <tr>
                             <th scope="row">Description</th>
                             <td>{{ object.description }}</td>

netbox_dns/templates/netbox_dns/record.html

@@ -53,6 +53,17 @@
                         <td><a href="{% url 'plugins:netbox_dns:zone_records' pk=object.zone.pk %}">{{ object.zone }}</a></td>
                         {% endif %}
                     </tr>
+                    {% if not object.managed %}
+                    <tr>
+                        <th scope="row">Tenant</th>
+                        <td>
+                            {% if object.tenant.group %}
+                                {{ object.tenant.group|linkify }} /
+                            {% endif %}
+                            {{ object.tenant|linkify|placeholder }}
+                        </td>
+                    </tr>
+                    {% endif %}
                     <tr>
                         <th scope="row">Type</th>
                         <td>{{ object.type }}</td>

netbox_dns/templates/netbox_dns/view.html

@@ -11,6 +11,15 @@
                             <th scope="row">Name</th>
                             <td>{{ object.name }}</td>
                         </tr>
+                        <tr>
+                            <th scope="row">Tenant</th>
+                            <td>
+                                {% if object.tenant.group %}
+                                    {{ object.tenant.group|linkify }} /
+                                {% endif %}
+                                {{ object.tenant|linkify|placeholder }}
+                            </td>
+                        </tr>
                         <tr>
                             <th scope="row">Description</th>
                             <td>{{ object.description }}</td>

netbox_dns/templates/netbox_dns/zone.html

@@ -32,6 +32,15 @@
                         </td>
                     </tr>
                     {% endif %}
+                    <tr>
+                        <th scope="row">Tenant</th>
+                        <td>
+                            {% if object.tenant.group %}
+                                {{ object.tenant.group|linkify }} /
+                            {% endif %}
+                            {{ object.tenant|linkify|placeholder }}
+                        </td>
+                    </tr>
                     <tr>
                         <th scope="row">Status</th>
                         <td>{{ object.status }}</td>

netbox_dns/utilities.py

@@ -4,7 +4,7 @@ from dns import name as dns_name
 from dns.exception import DNSException
 from netaddr import IPNetwork, AddrFormatError
 
-from extras.plugins import get_plugin_config
+from extras.plugins.utils import get_plugin_config
 
 
 class NameFormatError(Exception):

netbox_dns/validators.py

@@ -2,7 +2,7 @@ import re
 
 from django.core.exceptions import ValidationError
 
-from extras.plugins import get_plugin_config
+from extras.plugins.utils import get_plugin_config
 
 LABEL = r"[a-z0-9][a-z0-9-]*(?<!-)"
 UNDERSCORE_LABEL = r"[a-z0-9][a-z0-9-_]*(?<![-_])"

{netbox_plugin_dns-0.18.9.dist-info → netbox_plugin_dns-0.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.18.9
+Version: 0.19.0
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -44,7 +44,7 @@ NetBox DNS is using the standardized NetBox plugin interface, so it also takes a
 
 ## Requirements
 
-* NetBox 3.5 or higher
+* NetBox 3.5.8 or higher
 * Python 3.8 or higher
 
 ## Installation & Configuration

{netbox_plugin_dns-0.18.9.dist-info → netbox_plugin_dns-0.19.0.dist-info}/RECORD

@@ -1,23 +1,22 @@
-netbox_dns/__init__.py,sha256=Tx2pPCbCngy6dMojMV48gRTH-CqFdL7popJLUUdenjA,996
-netbox_dns/admin.py,sha256=LagzhiW7Dy9uFlPAbSXZWed8qBa6OvWOiHN2I7ipuTo,512
+netbox_dns/__init__.py,sha256=dhXfZywLmXW9vMvHwmYqZMX74hz6J_VC8PB8Aru9tV8,998
 netbox_dns/api/nested_serializers.py,sha256=L2LX0HuqKIjFxH7U7HD6ytg58LVat8ElRu7qTxgsKaE,2001
-netbox_dns/api/serializers.py,sha256=d6X5pbsbEHGuer2WLvXUR5LXxrqTQXAjJkON0JTFDRw,4630
+netbox_dns/api/serializers.py,sha256=2zQyUtze2YMrkrSQQ7QbuWMJLzd1hevFxdKY9h7PVGY,5060
 netbox_dns/api/urls.py,sha256=ZeJtiqrxEbw5Efeb4HWpb3rp9TDTHK8hwKvquYQ7RzM,441
-netbox_dns/api/views.py,sha256=RNGEpW_WhXuX-xU5FWFi41dFn-kHJTu-tqLJ-VoJN_8,3015
+netbox_dns/api/views.py,sha256=rF-9g3JbWRHCqcWlF1Oteqk7TNSDVf641TjAh8dsEtU,3074
 netbox_dns/apps.py,sha256=JCW5eS-AQBUubDJve1DjP-IRFKTFGQh1NLGWzJpC5MI,151
 netbox_dns/fields/__init__.py,sha256=KQxDL1BPIAUk5nBPtRyuZgRVHNDb8UrpG9KPIVq99VU,46
 netbox_dns/fields/address.py,sha256=hvZfYga6WrF-bi7rOl76aNAIVsdPAuIBf3b4d9-jejY,1530
 netbox_dns/fields/network.py,sha256=Pcd0kmtZI68-sVtMScpxtfUUbBuD2187JVHBQZV5TZE,3023
 netbox_dns/filters/__init__.py,sha256=deqMJWAXtLukzoBMpk6DCRUK8nTuYYlVvEDYVidOa54,88
-netbox_dns/filters/nameserver.py,sha256=XUcyv_iYJk50mJvazBXRiWf7t9N6ly37uAili1rTjcg,601
-netbox_dns/filters/record.py,sha256=EdIJ4eVYc0o_f2sl3ytmkrwFxupiE_UzXz916X0uXF0,1615
-netbox_dns/filters/view.py,sha256=327tKxOhUXvbRASFVJlaOiANwza4W_VsyL-JzMjMkHw,577
-netbox_dns/filters/zone.py,sha256=mRGF4xbAe9HBjWT8LrwRbBJu17QjYw7Nys9fdSgsy0Q,1185
+netbox_dns/filters/nameserver.py,sha256=IdeECQ8r-wanEI1o3UYivti3fcsoLpkK6R2HWOWnOU8,537
+netbox_dns/filters/record.py,sha256=DH1x4bNkBAN_gVNklAjorcgHoJmH_AXEf1sBNvJS6Kc,1691
+netbox_dns/filters/view.py,sha256=QzCFZU0d2JoAIks7zh0Cs94n4oNHu2uVG3JQzKPcpFE,519
+netbox_dns/filters/zone.py,sha256=1QOlnO-gy_7ofZ-Nyp896FvYxQN9TlnpMlNpYKx7RVY,1210
 netbox_dns/forms/__init__.py,sha256=deqMJWAXtLukzoBMpk6DCRUK8nTuYYlVvEDYVidOa54,88
-netbox_dns/forms/nameserver.py,sha256=E348ByczUWhvF_52Deov0wc0tNt5HuS5nDzadZkxYHI,1308
-netbox_dns/forms/record.py,sha256=hjlf0N3A-oPXFzK20rferVvhDIk-FOWeWjdlkYGA8v0,5083
-netbox_dns/forms/view.py,sha256=rqctM0fw_SFbJBmRmSj0qyMgk8uR4aRJEgSXztudP9U,961
-netbox_dns/forms/zone.py,sha256=d8evnvlnidQetFAvmX1GTvjwtGlegh9YbcQXwJVdxiI,14198
+netbox_dns/forms/nameserver.py,sha256=fgvME0-pHWPlnqx2BMkPckNhT0RXR52YLMQPuArpiyE,2007
+netbox_dns/forms/record.py,sha256=07Yrz-0JEbFistM0hcOVvK8TBM1EocdE7fCMmdRRJvk,6143
+netbox_dns/forms/view.py,sha256=Hr5yRx2lJAVcCdw0miYYE2kVop5ldjpbmWB69FgHvpc,1619
+netbox_dns/forms/zone.py,sha256=6GJ1ZMWaqttRQBmeSAfJq8nUpu5Ym2lD3gMPgJRxQao,14791
 netbox_dns/graphql/__init__.py,sha256=eBGy2jQHU03EDyO2Mhj7DXlJRCo9IGloWUyCoZL609g,604
 netbox_dns/graphql/nameserver.py,sha256=mlQw1Po_Ax_fjyyXVBetyxlFLrCqmptYDgOspZvYtP4,527
 netbox_dns/graphql/record.py,sha256=r_dtqRAid7wN_XgWTCR6XuKSAnSTz0z7hKUXcFt4AjU,487
@@ -50,37 +49,38 @@ netbox_dns/migrations/0020_netbox_3_4.py,sha256=GwnmlYdnWgLwt2-H7hOr0Zm4-s28aDpe
 netbox_dns/migrations/0021_record_ip_address.py,sha256=Vs_0an8q0ya-JKYXjYPCut2uSUpLHIOHlqw0Y9ccp8Q,3304
 netbox_dns/migrations/0022_search.py,sha256=2S6wnH3TC2cMqCKrs0chnNnbWJDc9-MQO79kGSovoA4,891
 netbox_dns/migrations/0023_alter_record_value.py,sha256=4_4v8YZzU8_jadJqIUUjH6SIhNTeALWhclozTqYDmv0,378
+netbox_dns/migrations/0024_tenancy.py,sha256=EmvBPNYe06h2lnaOLW55lN_vggN1W28VYdCljSOZmh8,1744
 netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-netbox_dns/models.py,sha256=mOvqB4nkNYSXCP9fw5tIxa_OBniiUyEWiVmwA1Bdgf0,29187
+netbox_dns/models.py,sha256=9W7KeblPq4aLQ42VCwZQKArzPWC-tL4NhJWXk3PqpYs,30289
 netbox_dns/navigation.py,sha256=qwXl66Y2NKbV38ygijX9atQnHinfWbYtc1q6VaKLGP0,3158
 netbox_dns/tables/__init__.py,sha256=deqMJWAXtLukzoBMpk6DCRUK8nTuYYlVvEDYVidOa54,88
-netbox_dns/tables/nameserver.py,sha256=hkHtsrm20yAEbVh40tCETd_i_ThaRX8MSruAT6_5mcw,701
-netbox_dns/tables/record.py,sha256=MLE2cKc7OIJZuogTPmskfeqBTwOa8vzmHEXavqknmzU,3064
-netbox_dns/tables/view.py,sha256=JO6CDb5cUMppE5hObZ18-fEBxmPQGYA-xCxLcZ2vBa8,325
-netbox_dns/tables/zone.py,sha256=ywlePsymsK8jXVzc_zeAG6pQUyBS__9DDEvULRwsHXI,1660
-netbox_dns/template_content.py,sha256=8A-eQnzfMxXO7wsH5qzu276s3Jbef36DUe-T2wsCu1o,1980
-netbox_dns/templates/netbox_dns/nameserver.html,sha256=QLBtDfMgF7IjYxPfxcZikXzo63pMHsVOj6QOzZh20Xk,1192
+netbox_dns/tables/nameserver.py,sha256=7Ap0px5gAHtgk5XFMpZCHccy9N-v8UKy19GP7fdWuPc,819
+netbox_dns/tables/record.py,sha256=TINCEboqJPg6lm9NMs4G9tbA5o1K5KzQsWvxtEJJGdM,3026
+netbox_dns/tables/view.py,sha256=gv6owrzcQ6G_Ue_xyWeO_k-oo9A81FeVQX-jlT84KFM,420
+netbox_dns/tables/zone.py,sha256=QWdU--WVM9ccz-J4g_zbfLYI96AFbr4osnFbzNu8j5M,1732
+netbox_dns/template_content.py,sha256=bSqK2PGtWd5PXPtbMF3w9m3HMqHvsNZRjZ6wsZohWWA,2012
+netbox_dns/templates/netbox_dns/nameserver.html,sha256=3AJVbsuhKg4Jy74rlvwrGSHd_IoDRdLT_XuK4EH3Djg,1623
 netbox_dns/templates/netbox_dns/record/managed.html,sha256=G6LPG1koUGuzUiwYdv1okdVa4sKaofiQegDBnsFL0kA,89
 netbox_dns/templates/netbox_dns/record/related.html,sha256=UhW0rwLrJdC1KqctthxdzKNlu0KFziNgaSphzqErM1M,378
-netbox_dns/templates/netbox_dns/record.html,sha256=QKcJq76csJkbJBJE-yvU_X3SFmtrvCV3wvCsRobffcA,4136
-netbox_dns/templates/netbox_dns/view.html,sha256=rVFUPjS76TXfUfSysEK45yh8IB6xmgWIzFSwoBFbaC8,919
+netbox_dns/templates/netbox_dns/record.html,sha256=ukPI5RVmiIlJD42DW2Xa8BRU2_T5L4dY8b64mOGieMc,4611
+netbox_dns/templates/netbox_dns/view.html,sha256=_lDjd2xY3upfGpNpemXXMzgsaKZlX3-PzPPAdYkIjvs,1350
 netbox_dns/templates/netbox_dns/zone/base.html,sha256=pucf_b7iGg4hCXqwIbR0_WtEQdeH2LQtTCRTSoeBhFc,460
 netbox_dns/templates/netbox_dns/zone/child.html,sha256=Y9dOUA8MPxuPqbbYV0KEZvLw1JIvfvOxbAVSv1c1l-k,2171
 netbox_dns/templates/netbox_dns/zone/managed_record.html,sha256=5P85eJuQOB7omih2vUXexRGjt4UF6McOM8f4D7QQbEw,524
 netbox_dns/templates/netbox_dns/zone/record.html,sha256=1oIRGXOZAjwmTMkTgArfKyVrmL54Sh_IN7IAF3qYEKM,2218
 netbox_dns/templates/netbox_dns/zone/related.html,sha256=1rOKq3RQ4ATsgmF5BUgTnPIr6KxFk9UDCnEe22Wi52I,215
-netbox_dns/templates/netbox_dns/zone.html,sha256=mKv_kyy8Mzn_pD83gUh33Zgc7pZ5LaXFO2BHBg1knlY,5480
+netbox_dns/templates/netbox_dns/zone.html,sha256=9RzlmINR5MjfK32PkDf0rzQk1ZGq9GCADTIaR3geSlc,5875
 netbox_dns/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/templatetags/view_helpers.py,sha256=M7ND-gQhPTey_4wlhalthucqKJf8UjjP4LGuHMw3j-c,271
 netbox_dns/urls.py,sha256=OtgPuajiRiCgF1ho7djIXX5xp30QVMgZuMVj7VWsiW0,5202
-netbox_dns/utilities.py,sha256=gZvzNSzXVmXRJD1IWeC-UhMFmDLQXhY2s-HZLAdmdEI,1777
-netbox_dns/validators.py,sha256=EfVED_afglfx5JJIJmPA1yQwUK98DXAgZhL0ytoMT4M,1821
+netbox_dns/utilities.py,sha256=uGMijuP8EstZ0F8Gad946XNiCyidx5JQmvx_4XQsl-o,1783
+netbox_dns/validators.py,sha256=J6FP5mfsUQt_FqpshazAO-7lUQ4y1JSNEH5sNM9atrM,1827
 netbox_dns/views/__init__.py,sha256=deqMJWAXtLukzoBMpk6DCRUK8nTuYYlVvEDYVidOa54,88
 netbox_dns/views/nameserver.py,sha256=6r6OtRstj04NLoNxidNAFJXkUlp-TIx4fHnuSp3ENag,2991
 netbox_dns/views/record.py,sha256=eT-M-rqhCrcmhpEyKOnQ8SWnxAVUgams5e86nVL9uc0,2554
 netbox_dns/views/view.py,sha256=eRFqMjPLPRjagtnPlBrw8G20MNlSykvdAhXoX1bHEFw,1895
 netbox_dns/views/zone.py,sha256=M5SXKwctdRKhdE4m7aBltfvc1ogZ7wwbW_91SYaUctw,3600
-netbox_plugin_dns-0.18.9.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-0.18.9.dist-info/METADATA,sha256=uwad_fwvY1nhh7fQ5o2_3V10d82Ay-rTX13wg54zx-k,3878
-netbox_plugin_dns-0.18.9.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-netbox_plugin_dns-0.18.9.dist-info/RECORD,,
+netbox_plugin_dns-0.19.0.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
+netbox_plugin_dns-0.19.0.dist-info/METADATA,sha256=D-5_bQsxB9eGmHRO6j67AF0KhhAMKhS9WGsR9yWY2Fo,3880
+netbox_plugin_dns-0.19.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+netbox_plugin_dns-0.19.0.dist-info/RECORD,,

{netbox_plugin_dns-0.18.9.dist-info → netbox_plugin_dns-0.19.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any

netbox_dns/admin.py

@@ -1,23 +0,0 @@
-from django.contrib import admin
-
-from .models import View, Zone, NameServer, Record
-
-
-@admin.register(View)
-class ViewAdmin(admin.ModelAdmin):
-    list_display = ("name",)
-
-
-@admin.register(Zone)
-class ZoneAdmin(admin.ModelAdmin):
-    list_display = ("name", "view", "status")
-
-
-@admin.register(NameServer)
-class NameServerAdmin(admin.ModelAdmin):
-    list_display = ("name",)
-
-
-@admin.register(Record)
-class RecordAdmin(admin.ModelAdmin):
-    list_display = ("zone", "type", "name", "value", "ttl", "managed")