netbox-plugin-dns 1.1.3__tar.gz → 1.1.5__tar.gz

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.3
+Version: 1.1.5
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -25,6 +25,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://github.com/peteeckel/netbox-plugin-dns/pulls"><img src="https://img.shields.io/github/issues-pr/peteeckel/netbox-plugin-dns" alt="Pull Requests Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/peteeckel/netbox-plugin-dns?color=2b9348"></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/blob/master/LICENSE"><img src="https://img.shields.io/github/license/peteeckel/netbox-plugin-dns?color=2b9348" alt="License Badge"/></a>
+<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style Black"/></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads" src="https://static.pepy.tech/badge/netbox-plugin-dns"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Week" src="https://static.pepy.tech/badge/netbox-plugin-dns/month"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>
@@ -32,7 +33,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 
 > [!WARNING]
 > **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
-> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This affects multiple aspects of the branching functionality, and currently there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
 > This warning will be updated as soon as the situation is resolved.
 
 ## Objectives

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/README.md

@@ -9,6 +9,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://github.com/peteeckel/netbox-plugin-dns/pulls"><img src="https://img.shields.io/github/issues-pr/peteeckel/netbox-plugin-dns" alt="Pull Requests Badge"/></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/graphs/contributors"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/peteeckel/netbox-plugin-dns?color=2b9348"></a>
 <a href="https://github.com/peteeckel/netbox-plugin-dns/blob/master/LICENSE"><img src="https://img.shields.io/github/license/peteeckel/netbox-plugin-dns?color=2b9348" alt="License Badge"/></a>
+<a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code Style Black"/></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads" src="https://static.pepy.tech/badge/netbox-plugin-dns"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Week" src="https://static.pepy.tech/badge/netbox-plugin-dns/month"></a>
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>
@@ -16,7 +17,7 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 
 > [!WARNING]
 > **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
-> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This affects multiple aspects of the branching functionality, and currently there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
 > This warning will be updated as soon as the situation is resolved.
 
 ## Objectives

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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
+from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.1.3"
+__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):
@@ -26,6 +32,13 @@ class DNSConfig(PluginConfig):
         "zone_soa_retry": 7200,
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
+        "zone_active_status": [
+            ZoneStatusChoices.STATUS_ACTIVE,
+            ZoneStatusChoices.STATUS_DYNAMIC,
+        ],
+        "record_active_status": [
+            RecordStatusChoices.STATUS_ACTIVE,
+        ],
         "dnssync_disabled": False,
         "dnssync_ipaddress_active_status": [
             IPAddressStatusChoices.STATUS_ACTIVE,
@@ -46,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"
@@ -54,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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/netbox_dns/choices/zone.py

@@ -13,10 +13,12 @@ class ZoneStatusChoices(ChoiceSet):
     STATUS_RESERVED = "reserved"
     STATUS_DEPRECATED = "deprecated"
     STATUS_PARKED = "parked"
+    STATUS_DYNAMIC = "dynamic"
 
     CHOICES = [
         (STATUS_ACTIVE, _("Active"), "blue"),
         (STATUS_RESERVED, _("Reserved"), "cyan"),
         (STATUS_DEPRECATED, _("Deprecated"), "red"),
         (STATUS_PARKED, _("Parked"), "gray"),
+        (STATUS_DYNAMIC, _("Dynamic"), "orange"),
     ]

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/netbox_dns/fields/address.py

@@ -1,31 +1,13 @@
-from django import forms
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from netaddr import AddrFormatError, IPAddress
 
+from ipam.formfields import IPAddressFormField
 
-__all__ = (
-    "AddressFormField",
-    "AddressField",
-)
 
-
-class AddressFormField(forms.Field):
-    def to_python(self, value):
-        if not value:
-            return None
-
-        if isinstance(value, IPAddress):
-            return value
-
-        try:
-            ip_address = IPAddress(value)
-        except AddrFormatError as exc:
-            raise ValidationError(exc)
-
-        return ip_address
+__all__ = ("AddressField",)
 
 
 class AddressField(models.Field):
@@ -58,7 +40,7 @@ class AddressField(models.Field):
         return str(self.to_python(value))
 
     def form_class(self):
-        return AddressFormField
+        return IPAddressFormField
 
     def formfield(self, **kwargs):
         defaults = {"form_class": self.form_class()}

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/netbox_dns/filtersets/record.py

@@ -76,6 +76,9 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         method="filter_ip_address",
         label=_("IP Address"),
     )
+    active = django_filters.BooleanFilter(
+        label=_("Record is active"),
+    )
 
     managed = django_filters.BooleanFilter()
 

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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,
@@ -38,12 +37,6 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        initial_zone_id = self.initial.get("zone")
-        if initial_zone_id is not None:
-            self.initial["view"] = Zone.objects.get(pk=initial_zone_id).view
-        else:
-            self.initial["view"] = View.get_default_view()
-
         initial_name = self.initial.get("name")
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
@@ -51,7 +44,10 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label=_p("DNS", "View"),
+        initial_params={
+            "zone": "$zone",
+        },
+        label=_("View"),
     )
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
@@ -111,6 +107,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
+            "view_id",
             "zone_id",
             "name",
             "fqdn",
@@ -118,6 +115,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "value",
             "disable_ptr",
             "status",
+            "active",
             "description",
             name=_("Attributes"),
         ),
@@ -151,10 +149,23 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    view_id = DynamicModelMultipleChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        label=_("View"),
+    )
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
         label=_("Zone"),
+        query_params={
+            "view_id": "$view_id",
+        },
+    )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
     )
     description = forms.CharField(
         required=False,
@@ -175,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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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,
@@ -354,6 +353,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "status",
             "name",
             "nameserver_id",
+            "active",
             "description",
             name=_("Attributes"),
         ),
@@ -384,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,
@@ -400,6 +400,11 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Nameservers"),
     )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
+    )
     description = forms.CharField(
         required=False,
         label=_("Description"),
@@ -470,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"),
     )
@@ -499,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"),
@@ -554,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"),
     )
@@ -567,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"),
     )
@@ -576,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"),
     )
@@ -585,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"),
     )
@@ -669,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),
@@ -781,7 +786,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     tenant_group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         required=False,
-        label=_("Tenant"),
+        label=_("Tenant Group"),
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),

{netbox_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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_plugin_dns-1.1.3 → netbox_plugin_dns-1.1.5}/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),