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

netbox_dns/forms/zone_template.py

@@ -1,4 +1,5 @@
 from django import forms
+from django.utils.translation import gettext_lazy as _
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -14,7 +15,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
 )
 from utilities.forms.rendering import FieldSet
-from tenancy.models import Tenant
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import (
@@ -45,18 +46,18 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
     )
 
     fieldsets = (
-        FieldSet("name", "description", "nameservers", name="Zone Template"),
-        FieldSet("record_templates", name="Record Templates"),
+        FieldSet("name", "description", "nameservers", name=_("Zone Template")),
+        FieldSet("record_templates", name=_("Record Templates")),
         FieldSet(
             "registrar",
             "registrant",
             "admin_c",
             "tech_c",
             "billing_c",
-            name="Domain Registration",
+            name=_("Domain Registration"),
         ),
-        FieldSet("tags", name="Tags"),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
+        FieldSet("tags", name=_("Tags")),
     )
 
     class Meta:
@@ -67,13 +68,14 @@ class ZoneTemplateForm(TenancyForm, NetBoxModelForm):
             "nameservers",
             "record_templates",
             "description",
-            "tags",
             "registrar",
             "registrant",
             "admin_c",
             "tech_c",
             "billing_c",
+            "tenant_group",
             "tenant",
+            "tags",
         )
 
 
@@ -81,32 +83,32 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = ZoneTemplate
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "nameserver_id", "description", name="Attributes"),
-        FieldSet("record_template_id", name="Record Templates"),
+        FieldSet("name", "nameserver_id", "description", name=_("Attributes")),
+        FieldSet("record_template_id", name=_("Record Templates")),
         FieldSet(
             "registrar_id",
             "registrant_id",
             "admin_c_id",
             "tech_c_id",
             "billing_c_id",
-            name="Registration",
+            name=_("Registration"),
         ),
-        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
+        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
 
     name = forms.CharField(
         required=False,
-        label="Template name",
+        label=_("Template Name"),
     )
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
-        label="Nameservers",
+        label=_("Nameservers"),
     )
     record_template_id = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
-        label="Record templates",
+        label=_("Record Templates"),
     )
     description = forms.CharField(
         required=False,
@@ -114,27 +116,27 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     registrar_id = DynamicModelMultipleChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
-        label="Registrar",
+        label=_("Registrar"),
     )
     registrant_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Registrant",
+        label=_("Registrant"),
     )
     admin_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Admin-C",
+        label=_("Administrative Contact"),
     )
     tech_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Tech-C",
+        label=_("Technical Contact"),
     )
     billing_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Billing-C",
+        label=_("Billing Contact"),
     )
     tag = TagFilterField(ZoneTemplate)
 
@@ -144,64 +146,64 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         queryset=NameServer.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Name servers for the zone template",
+        label=_("Nameservers"),
     )
     record_templates = CSVModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Record templates used by this zone template",
+        label=_("Record Remplates"),
     )
     registrar = CSVModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="Registrar the domain is registered with",
         error_messages={
-            "invalid_choice": "Registrar not found.",
+            "invalid_choice": _("Registrar not found."),
         },
+        label=_("Registrar"),
     )
     registrant = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Owner of the domain",
         error_messages={
-            "invalid_choice": "Registrant contact ID not found",
+            "invalid_choice": _("Registrant contact ID not found"),
         },
+        label=_("Registrant"),
     )
     admin_c = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Administrative contact for the domain",
         error_messages={
-            "invalid_choice": "Administrative contact ID not found",
+            "invalid_choice": _("Administrative contact ID not found"),
         },
+        label=_("Administrative Contact"),
     )
     tech_c = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Technical contact for the domain",
         error_messages={
-            "invalid_choice": "Technical contact ID not found",
+            "invalid_choice": _("Technical contact ID not found"),
         },
+        label=_("Technical Contact"),
     )
     billing_c = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
-        help_text="Billing contact for the domain",
         error_messages={
-            "invalid_choice": "Billing contact ID not found",
+            "invalid_choice": _("Billing contact ID not found"),
         },
+        label=_("Billing Contact"),
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         required=False,
         to_field_name="name",
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
 
     class Meta:
@@ -226,42 +228,49 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        label=_("Nameservers"),
     )
     record_templates = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
+        label=_("Record Templates"),
     )
     description = forms.CharField(max_length=200, required=False)
     registrar = DynamicModelChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
+        label=_("Registrar"),
     )
     registrant = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        label=_("Registrant"),
     )
     admin_c = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Administrative Contact",
+        label=_("Administrative Contact"),
     )
     tech_c = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Technical Contact",
+        label=_("Technical Contact"),
     )
     billing_c = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
-        label="Billing Contact",
+        label=_("Billing Contact"),
     )
-    tenant = CSVModelChoiceField(
+    tenant_group = DynamicModelChoiceField(
+        queryset=TenantGroup.objects.all(),
+        required=False,
+        label=_("Tenant Group"),
+    )
+    tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
         required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
     model = ZoneTemplate
 
@@ -269,11 +278,11 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "nameservers",
             "description",
-            name="Attributes",
+            name=_("Attributes"),
         ),
         FieldSet(
             "record_templates",
-            name="Record Templates",
+            name=_("Record Templates"),
         ),
         FieldSet(
             "registrar",
@@ -281,9 +290,9 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
             "admin_c",
             "tech_c",
             "billing_c",
-            name="Domain Registration",
+            name=_("Domain Registration"),
         ),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
     )
 
     nullable_fields = (
@@ -295,4 +304,5 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         "admin_c",
         "tech_c",
         "billing_c",
+        "tenant",
     )

netbox_dns/management/commands/rebuild_dnssync.py

@@ -8,6 +8,13 @@ from netbox_dns.utilities import update_dns_records
 class Command(BaseCommand):
     help = "Rebuild DNSsync relationships between IP addresses and records"
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--force",
+            action="store_true",
+            help="Update records even if DNS name was not changed (required for rebuilding filtered views",
+        )
+
     def handle(self, *model_names, **options):
         ip_addresses = IPAddress.objects.all()
         for ip_address in ip_addresses:
@@ -15,4 +22,10 @@ class Command(BaseCommand):
                 self.stdout.write(
                     f"Updating DNS records for IP Address {ip_address}, VRF {ip_address.vrf}"
                 )
-            update_dns_records(ip_address)
+            if (
+                update_dns_records(ip_address, force=options.get("force"))
+                and options.get("verbosity") >= 1
+            ):
+                self.stdout.write(
+                    f"Updated DNS records for IP Address {ip_address}, VRF {ip_address.vrf}"
+                )

netbox_dns/models/nameserver.py

@@ -4,6 +4,7 @@ from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import Q
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
@@ -29,14 +30,17 @@ __all__ = (
 
 class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
+        verbose_name=_("Name"),
         unique=True,
         max_length=255,
     )
     description = models.CharField(
+        verbose_name=_("Description"),
         max_length=200,
         blank=True,
     )
     tenant = models.ForeignKey(
+        verbose_name=_("Tenant"),
         to="tenancy.Tenant",
         on_delete=models.PROTECT,
         related_name="netbox_dns_nameservers",
@@ -50,8 +54,8 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     )
 
     class Meta:
-        verbose_name = "Nameserver"
-        verbose_name_plural = "Nameservers"
+        verbose_name = _("Nameserver")
+        verbose_name_plural = _("Nameservers")
 
         ordering = ("name",)
 

netbox_dns/models/record.py

@@ -8,6 +8,7 @@ from django.db import transaction, models
 from django.db.models import Q, ExpressionWrapper, BooleanField, Min
 from django.urls import reverse
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
 from ipam.models import IPAddress
@@ -33,6 +34,9 @@ __all__ = (
     "RecordIndex",
 )
 
+ZONE_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "zone_active_status")
+RECORD_ACTIVE_STATUS_LIST = get_plugin_config("netbox_dns", "record_active_status")
+
 
 def min_ttl(*ttl_list):
     return min((ttl for ttl in ttl_list if ttl is not None), default=None)
@@ -101,14 +105,14 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
             .annotate(
                 active=ExpressionWrapper(
                     Q(
-                        Q(zone__status__in=zone.Zone.ACTIVE_STATUS_LIST)
+                        Q(zone__status__in=ZONE_ACTIVE_STATUS_LIST)
                         & Q(
                             Q(address_record__isnull=True)
                             | Q(
-                                address_record__zone__status__in=zone.Zone.ACTIVE_STATUS_LIST
+                                address_record__zone__status__in=ZONE_ACTIVE_STATUS_LIST
                             )
                         )
-                        & Q(status__in=Record.ACTIVE_STATUS_LIST)
+                        & Q(status__in=RECORD_ACTIVE_STATUS_LIST)
                     ),
                     output_field=BooleanField(),
                 )
@@ -117,66 +121,73 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
 
 
 class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
-    ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
-
     unique_ptr_qs = Q(
         Q(disable_ptr=False),
         Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
     )
 
     name = models.CharField(
+        verbose_name=_("Name"),
         max_length=255,
     )
     zone = models.ForeignKey(
-        "Zone",
+        verbose_name=_("Zone"),
+        to="Zone",
         on_delete=models.CASCADE,
     )
     fqdn = models.CharField(
+        verbose_name=_("FQDN"),
         max_length=255,
         null=True,
         blank=True,
         default=None,
     )
     type = models.CharField(
+        verbose_name=_("Type"),
         choices=RecordTypeChoices,
         max_length=10,
     )
     value = models.CharField(
+        verbose_name=_("Value"),
         max_length=65535,
     )
     status = models.CharField(
+        verbose_name=_("Status"),
         max_length=50,
         choices=RecordStatusChoices,
         default=RecordStatusChoices.STATUS_ACTIVE,
         blank=False,
     )
     ttl = models.PositiveIntegerField(
-        verbose_name="TTL",
+        verbose_name=_("TTL"),
         null=True,
         blank=True,
     )
     managed = models.BooleanField(
+        verbose_name=_("Managed"),
         null=False,
         default=False,
     )
     ptr_record = models.OneToOneField(
-        "self",
+        verbose_name="PTR Record",
+        to="self",
         on_delete=models.SET_NULL,
         related_name="address_record",
-        verbose_name="PTR record",
         null=True,
         blank=True,
     )
     disable_ptr = models.BooleanField(
-        verbose_name="Disable PTR",
-        help_text="Disable PTR record creation",
+        verbose_name=_("Disable PTR"),
+        help_text=_("Disable PTR record creation"),
         default=False,
     )
     description = models.CharField(
+        verbose_name=_("Description"),
         max_length=200,
         blank=True,
     )
     tenant = models.ForeignKey(
+        verbose_name=_("Tenant"),
         to="tenancy.Tenant",
         on_delete=models.PROTECT,
         related_name="netbox_dns_records",
@@ -184,13 +195,13 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     ip_address = AddressField(
-        verbose_name="Related IP Address",
-        help_text="IP address related to an address (A/AAAA) or PTR record",
+        verbose_name=_("Related IP Address"),
+        help_text=_("IP address related to an address (A/AAAA) or PTR record"),
         blank=True,
         null=True,
     )
     ipam_ip_address = models.ForeignKey(
-        verbose_name="IPAM IP Address",
+        verbose_name=_("IPAM IP Address"),
         to="ipam.IPAddress",
         on_delete=models.CASCADE,
         related_name="netbox_dns_records",
@@ -198,10 +209,10 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
     rfc2317_cname_record = models.ForeignKey(
-        "self",
+        verbose_name=_("RFC2317 CNAME Record"),
+        to="self",
         on_delete=models.SET_NULL,
         related_name="rfc2317_ptr_records",
-        verbose_name="RFC2317 CNAME record",
         null=True,
         blank=True,
     )
@@ -221,8 +232,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     )
 
     class Meta:
-        verbose_name = "Record"
-        verbose_name_plural = "Records"
+        verbose_name = _("Record")
+        verbose_name_plural = _("Records")
 
         ordering = (
             "fqdn",
@@ -285,8 +296,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     @property
     def is_active(self):
         return (
-            self.status in Record.ACTIVE_STATUS_LIST
-            and self.zone.status in zone.Zone.ACTIVE_STATUS_LIST
+            self.status in RECORD_ACTIVE_STATUS_LIST
+            and self.zone.status in ZONE_ACTIVE_STATUS_LIST
         )
 
     @property
@@ -537,7 +548,9 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if not fqdn.is_subdomain(_zone):
             raise ValidationError(
                 {
-                    "name": f"{self.name} is not a name in {zone.name}",
+                    "name": _("{name} is not a name in {zone}").format(
+                        name=self.name, zone=zone.name
+                    ),
                 }
             )
 
@@ -581,13 +594,13 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                     {
                         "name": exc,
                     }
-                ) from None
+                )
 
     def validate_value(self):
         try:
-            validate_record_value(self.type, self.value)
+            validate_record_value(self)
         except ValidationError as exc:
-            raise ValidationError({"value": exc}) from None
+            raise ValidationError({"value": exc})
 
     def check_unique_record(self, new_zone=None):
         if not get_plugin_config("netbox_dns", "enforce_unique_records", False):
@@ -604,7 +617,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             name=self.name,
             type=self.type,
             value=self.value,
-            status__in=Record.ACTIVE_STATUS_LIST,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
         )
 
         if not self._state.adding:
@@ -621,9 +634,13 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 
             raise ValidationError(
                 {
-                    "value": f"There is already an active {self.type} record for name {self.name} in zone {self.zone} with value {self.value}."
+                    "value": _(
+                        "There is already an active {type} record for name {name} in zone {zone} with value {value}."
+                    ).format(
+                        type=self.type, name=self.name, zone=self.zone, value=self.value
+                    )
                 }
-            ) from None
+            )
 
     def handle_conflicting_address_records(self):
         if self.ipam_ip_address is None or not self.is_active:
@@ -637,7 +654,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             name=self.name,
             type=self.type,
             value=self.value,
-            status__in=Record.ACTIVE_STATUS_LIST,
+            status__in=RECORD_ACTIVE_STATUS_LIST,
             ipam_ip_address__isnull=True,
         )
 
@@ -680,9 +697,16 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         conflicting_ttls = ", ".join({str(record.ttl) for record in records})
         raise ValidationError(
             {
-                "ttl": f"There is at least one active {self.type} record for name {self.name} in zone {self.zone} and TTL is different ({conflicting_ttls})."
+                "ttl": _(
+                    "There is at least one active {type} record for name {name} in zone {zone} and TTL is different ({ttls})."
+                ).format(
+                    type=self.type,
+                    name=self.name,
+                    zone=self.zone,
+                    ttls=conflicting_ttls,
+                )
             }
-        ) from None
+        )
 
     def update_rrset_ttl(self, ttl=None):
         if self._state.adding:
@@ -760,24 +784,30 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 ):
                     raise ValidationError(
                         {
-                            "value": f"There is already an active record for name {ptr_cname_name} in zone {ptr_cname_zone}, RFC2317 CNAME is not allowed."
+                            "value": _(
+                                "There is already an active record for name {name} in zone {zone}, RFC2317 CNAME is not allowed."
+                            ).format(name=ptr_cname_name, zone=ptr_cname_zone)
                         }
-                    ) from None
+                    )
 
         if self.type == RecordTypeChoices.SOA and self.name != "@":
             raise ValidationError(
                 {
-                    "name": "SOA records are only allowed with name @ and are created automatically by NetBox DNS"
+                    "name": _(
+                        "SOA records are only allowed with name @ and are created automatically by NetBox DNS"
+                    )
                 }
-            ) from None
+            )
 
         if self.type == RecordTypeChoices.CNAME:
             if records.exclude(type=RecordTypeChoices.NSEC).exists():
                 raise ValidationError(
                     {
-                        "type": f"There is already an active record for name {self.name} in zone {self.zone}, CNAME is not allowed."
+                        "type": _(
+                            "There is already an active record for name {name} in zone {zone}, CNAME is not allowed."
+                        ).format(name=self.name, zone=self.zone)
                     }
-                ) from None
+                )
 
         elif (
             records.filter(type=RecordTypeChoices.CNAME).exists()
@@ -785,17 +815,21 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         ):
             raise ValidationError(
                 {
-                    "type": f"There is already an active CNAME record for name {self.name} in zone {self.zone}, no other record allowed."
+                    "type": _(
+                        "There is already an active CNAME record for name {name} in zone {zone}, no other record allowed."
+                    ).format(name=self.name, zone=self.zone)
                 }
-            ) from None
+            )
 
         elif self.type in RecordTypeChoices.SINGLETONS:
             if records.filter(type=self.type).exists():
                 raise ValidationError(
                     {
-                        "type": f"There is already an active {self.type} record for name {self.name} in zone {self.zone}, more than one are not allowed."
+                        "type": _(
+                            "There is already an active {type} record for name {name} in zone {zone}, more than one are not allowed."
+                        ).format(type=self.type, name=self.name, zone=self.zone)
                     }
-                ) from None
+                )
 
         super().clean(*args, **kwargs)