netbox-plugin-dns 1.1.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

netbox_dns/__init__.py

@@ -1,12 +1,18 @@
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ImproperlyConfigured
 
 from netbox.plugins import PluginConfig
+from netbox.plugins.utils import get_plugin_config
 from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.4"
+__version__ = "1.1.5"
+
+
+def _check_list(setting):
+    if not isinstance(get_plugin_config("netbox_dns", setting), list):
+        raise ImproperlyConfigured(f"{setting} must be a list")
 
 
 class DNSConfig(PluginConfig):
@@ -53,7 +59,7 @@ class DNSConfig(PluginConfig):
         "enable_root_zones": False,
         "enforce_unique_records": True,
         "enforce_unique_rrset_ttl": True,
-        "menu_name": "NetBox DNS",
+        "menu_name": "DNS",
         "top_level_menu": True,
     }
     base_url = "netbox-dns"
@@ -61,10 +67,18 @@ class DNSConfig(PluginConfig):
     def ready(self):
         super().ready()
 
-        if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+        if not get_plugin_config("netbox_dns", "dnssync_disabled"):
             import netbox_dns.signals.ipam_dnssync  # noqa: F401
             import netbox_dns.tables.ipam_dnssync  # noqa: F401
 
+        for setting in (
+            "zone_active_status",
+            "record_active_status",
+            "dnssync_ipaddress_active_status",
+            "tolerate_leading_underscore_types",
+        ):
+            _check_list(setting)
+
 
 #
 # Initialize plugin config

netbox_dns/api/views.py

@@ -71,7 +71,7 @@ class NameServerViewSet(NetBoxModelViewSet):
 
 
 class RecordViewSet(NetBoxModelViewSet):
-    queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")
+    queryset = Record.objects.prefetch_related("zone", "zone__view", "tenant")
     serializer_class = RecordSerializer
     filterset_class = RecordFilterSet
 

netbox_dns/filtersets/record.py

@@ -92,7 +92,6 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "ttl",
             "value",
             "disable_ptr",
-            "active",
             "managed",
         )
 

netbox_dns/filtersets/zone.py

@@ -3,7 +3,6 @@ import netaddr
 import django_filters
 from django.db.models import Q
 from django.utils.translation import gettext as _
-from django.utils.translation import pgettext as _p
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
@@ -28,7 +27,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=View.objects.all(),
         field_name="view__name",
         to_field_name="name",
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     # DEPRECATED: Remove in 1.1
     name_server_id = django_filters.ModelMultipleChoiceFilter(

netbox_dns/forms/record.py

@@ -1,6 +1,5 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -48,7 +47,7 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         initial_params={
             "zone": "$zone",
         },
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
@@ -187,23 +186,28 @@ class RecordImportForm(NetBoxModelImportForm):
                 pass
 
         if view is not None:
-            self.fields["zone"].queryset = Zone.objects.filter(view=view)
+            self.fields["zone"].queryset = view.zone_set
         else:
-            self.fields["zone"].queryset = Zone.objects.filter(
-                view=View.get_default_view()
-            )
+            self.fields["zone"].queryset = View.get_default_view().zone_set
 
     zone = CSVModelChoiceField(
         queryset=Zone.objects.all(),
         to_field_name="name",
         required=True,
         label=_("Zone"),
+        error_messages={
+            "invalid_choice": _("Zone %(value)s not found"),
+        },
     )
     view = CSVModelChoiceField(
         queryset=View.objects.all(),
         to_field_name="name",
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
+        error_messages={
+            "invalid_choice": _("View %(value)s not found"),
+        },
+        help_text=_("This field is required if the zone is not in the default view"),
     )
     type = CSVChoiceField(
         choices=RecordTypeChoices,

netbox_dns/forms/view.py

@@ -3,7 +3,6 @@ from django.conf import settings
 from django.core.exceptions import ValidationError, FieldError
 from django.db.models import Q, Count
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -127,7 +126,7 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
     )
 
     fieldsets = (
-        FieldSet("name", "default_view", "description", name=_p("DNS", "View")),
+        FieldSet("name", "default_view", "description", name=_("View")),
         FieldSet("prefixes", "ip_address_filter"),
         FieldSet("tenant_group", "tenant", name=_("Tenancy")),
         FieldSet("tags", name=_("Tags")),
@@ -302,7 +301,7 @@ class ViewPrefixEditForm(forms.ModelForm):
 
         if not views.exists():
             if (parent := prefix.get_parents().last()) is not None:
-                check_views = parent.netbox_dns_views.all().difference(old_views)
+                check_views = parent.netbox_dns_views.difference(old_views)
 
         else:
             check_views = views.difference(old_views)

netbox_dns/forms/zone.py

@@ -4,7 +4,6 @@ from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -385,7 +384,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     status = forms.MultipleChoiceField(
         choices=ZoneStatusChoices,
@@ -476,7 +475,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("View not found."),
+            "invalid_choice": _("View %(value)s not found"),
         },
         label=_("View"),
     )
@@ -505,7 +504,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Nameserver not found."),
+            "invalid_choice": _("Nameserver %(value)s not found"),
         },
         help_text=_("Primary nameserver for the zone"),
         label=_("SOA MName"),
@@ -560,7 +559,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Registrar not found."),
+            "invalid_choice": _("Registrar %(value)s not found"),
         },
         label=_("Registrar"),
     )
@@ -573,7 +572,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Registrant contact ID not found"),
+            "invalid_choice": _("Registrant contact ID %(value)s not found"),
         },
         label=_("Registrant"),
     )
@@ -582,7 +581,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Administrative contact ID not found"),
+            "invalid_choice": _("Administrative contact ID %(value)s not found"),
         },
         label=_("Administrative Contact"),
     )
@@ -591,7 +590,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Technical contact ID not found"),
+            "invalid_choice": _("Technical contact ID %(value)s not found"),
         },
         label=_("Technical Contact"),
     )
@@ -675,7 +674,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label=_p("DNS", "View"),
+        label=_("View"),
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(ZoneStatusChoices),

netbox_dns/forms/zone_template.py

@@ -159,7 +159,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="name",
         error_messages={
-            "invalid_choice": _("Registrar not found."),
+            "invalid_choice": _("Registrar %(value)s not found"),
         },
         label=_("Registrar"),
     )
@@ -168,7 +168,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Registrant contact ID not found"),
+            "invalid_choice": _("Registrant contact ID %(value)s not found"),
         },
         label=_("Registrant"),
     )
@@ -177,7 +177,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Administrative contact ID not found"),
+            "invalid_choice": _("Administrative contact ID %(value)s not found"),
         },
         label=_("Administrative Contact"),
     )
@@ -186,7 +186,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Technical contact ID not found"),
+            "invalid_choice": _("Technical contact ID %(value)s not found"),
         },
         label=_("Technical Contact"),
     )
@@ -195,7 +195,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         required=False,
         to_field_name="contact_id",
         error_messages={
-            "invalid_choice": _("Billing contact ID not found"),
+            "invalid_choice": _("Billing contact ID %(value)s not found"),
         },
         label=_("Billing Contact"),
     )

netbox_dns/models/nameserver.py

@@ -19,8 +19,6 @@ from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.validators import validate_fqdn
 from netbox_dns.mixins import ObjectModificationMixin
 
-from .record import Record
-
 
 __all__ = (
     "NameServer",
@@ -80,7 +78,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 {
                     "name": str(exc),
                 }
-            ) from None
+            )
 
         try:
             validate_fqdn(self.name)
@@ -89,7 +87,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 {
                     "name": exc,
                 }
-            ) from None
+            )
 
         super().clean(*args, **kwargs)
 
@@ -112,10 +110,8 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     def delete(self, *args, **kwargs):
         with transaction.atomic():
-            zones = self.zones.all()
-            for zone in zones:
-                Record.objects.filter(
-                    Q(zone=zone),
+            for zone in self.zones.all():
+                zone.record_set.filter(
                     Q(managed=True),
                     Q(value=f"{self.name}."),
                     Q(type=RecordTypeChoices.NS),

netbox_dns/models/record.py

@@ -23,11 +23,6 @@ from netbox_dns.validators import validate_generic_name, validate_record_value
 from netbox_dns.mixins import ObjectModificationMixin
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
 
-# +
-# This is a hack designed to break cyclic imports between Record and Zone
-# -
-from netbox_dns.models import zone
-
 
 __all__ = (
     "Record",
@@ -105,14 +100,8 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
             .annotate(
                 active=ExpressionWrapper(
                     Q(
-                        Q(zone__status__in=ZONE_ACTIVE_STATUS_LIST)
-                        & Q(
-                            Q(address_record__isnull=True)
-                            | Q(
-                                address_record__zone__status__in=ZONE_ACTIVE_STATUS_LIST
-                            )
-                        )
-                        & Q(status__in=RECORD_ACTIVE_STATUS_LIST)
+                        zone__status__in=ZONE_ACTIVE_STATUS_LIST,
+                        status__in=RECORD_ACTIVE_STATUS_LIST,
                     ),
                     output_field=BooleanField(),
                 )
@@ -269,7 +258,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
     @property
     def value_fqdn(self):
-        if self.type != RecordTypeChoices.CNAME:
+        if self.type not in (RecordTypeChoices.CNAME, RecordTypeChoices.NS):
             return None
 
         _zone = dns_name.from_text(self.zone.name)
@@ -331,8 +320,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def ptr_zone(self):
         if self.type == RecordTypeChoices.A:
             ptr_zone = (
-                zone.Zone.objects.filter(
-                    view=self.zone.view,
+                self.zone.view.zone_set.filter(
                     rfc2317_prefix__net_contains=self.value,
                 )
                 .order_by("rfc2317_prefix__net_mask_length")
@@ -343,15 +331,17 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 return ptr_zone
 
         ptr_zone = (
-            zone.Zone.objects.filter(
-                view=self.zone.view, arpa_network__net_contains=self.value
-            )
+            self.zone.view.zone_set.filter(arpa_network__net_contains=self.value)
             .order_by("arpa_network__net_mask_length")
             .last()
         )
 
         return ptr_zone
 
+    @property
+    def is_delegation_record(self):
+        return self in self.zone.delegation_records
+
     def update_ptr_record(self, update_rfc2317_cname=True, save_zone_serial=True):
         ptr_zone = self.ptr_zone
 
@@ -461,10 +451,9 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
                 self.remove_from_rfc2317_cname_record(save_zone_serial=save_zone_serial)
 
-            rfc2317_cname_record = Record.objects.filter(
+            rfc2317_cname_record = self.zone.rfc2317_parent_zone.record_set.filter(
                 name=cname_name,
                 type=RecordTypeChoices.CNAME,
-                zone=self.zone.rfc2317_parent_zone,
                 managed=True,
                 value=self.fqdn,
             ).first()
@@ -612,8 +601,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if new_zone is None:
             new_zone = self.zone
 
-        records = Record.objects.filter(
-            zone=new_zone,
+        records = new_zone.record_set.filter(
             name=self.name,
             type=self.type,
             value=self.value,
@@ -649,8 +637,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if not get_plugin_config("netbox_dns", "dnssync_conflict_deactivate", False):
             return
 
-        records = Record.objects.filter(
-            zone=self.zone,
+        records = self.zone.record_set.filter(
             name=self.name,
             type=self.type,
             value=self.value,
@@ -678,8 +665,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             return
 
         records = (
-            Record.objects.filter(
-                zone=self.zone,
+            self.zone.record_set.filter(
                 name=self.name,
                 type=self.type,
             )
@@ -722,8 +708,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             ttl = self.ttl
 
         records = (
-            Record.objects.filter(
-                zone=self.zone,
+            self.zone.record_set.filter(
                 name=self.name,
                 type=self.type,
             )
@@ -751,9 +736,9 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if not self.is_active:
             return
 
-        records = Record.objects.filter(
-            name=self.name, zone=self.zone, active=True
-        ).exclude(pk=self.pk)
+        records = self.zone.record_set.filter(name=self.name, active=True).exclude(
+            pk=self.pk
+        )
 
         if self.type == RecordTypeChoices.A and not self.disable_ptr:
             ptr_zone = self.ptr_zone
@@ -770,8 +755,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 )
 
                 if (
-                    Record.objects.filter(
-                        zone=ptr_cname_zone,
+                    ptr_cname_zone.record_set.filter(
                         name=ptr_cname_name,
                         active=True,
                     )

netbox_dns/models/record_template.py

@@ -133,17 +133,17 @@ class RecordTemplate(NetBoxModel):
                     {
                         "record_name": exc,
                     }
-                ) from None
+                )
 
     def validate_value(self):
         try:
             validate_record_value(self)
         except ValidationError as exc:
-            raise ValidationError({"value": exc}) from None
+            raise ValidationError({"value": exc})
 
     def matching_records(self, zone):
-        return Record.objects.filter(
-            zone=zone, name=self.record_name, type=self.type, value=self.value
+        return zone.record_set.filter(
+            name=self.record_name, type=self.type, value=self.value
         )
 
     def create_record(self, zone):

netbox_dns/models/view.py

@@ -2,7 +2,6 @@ from django.db import models
 from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import pgettext_lazy as _p
 
 from netbox.models import NetBoxModel
 from netbox.models.features import ContactsMixin
@@ -77,8 +76,8 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         return str(self.name)
 
     class Meta:
-        verbose_name = _p("DNS", "View")
-        verbose_name_plural = _p("DNS", "Views")
+        verbose_name = _("View")
+        verbose_name_plural = _("Views")
 
         ordering = ("name",)