netbox-plugin-dns 1.1.1__py3-none-any.whl → 1.1.3__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/graphql/schema.py

@@ -3,16 +3,6 @@ from typing import List
 import strawberry
 import strawberry_django
 
-from netbox_dns.models import (
-    NameServer,
-    View,
-    Zone,
-    Record,
-    RegistrationContact,
-    Registrar,
-    ZoneTemplate,
-    RecordTemplate,
-)
 from .types import (
     NetBoxDNSNameServerType,
     NetBoxDNSViewType,

netbox_dns/graphql/types.py

@@ -43,6 +43,7 @@ class NetBoxDNSViewType(NetBoxObjectType):
     description: str
     tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
     prefixes: List[Annotated["PrefixType", strawberry.lazy("ipam.graphql.types")]]
+    ip_address_filter: str | None
 
 
 @strawberry_django.type(Zone, fields="__all__", filters=NetBoxDNSZoneFilter)

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/migrations/0010_view_ip_address_filter.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-09-18 13:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0009_rename_contact_registrationcontact"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="view",
+            name="ip_address_filter",
+            field=models.JSONField(blank=True, null=True),
+        ),
+    ]

netbox_dns/mixins/object_modification.py

@@ -17,15 +17,37 @@ class ObjectModificationMixin:
 
             self.__class__.check_fields.add("custom_field_data")
 
+        self._save_field_values()
+
+    def _save_field_values(self):
+        for field in self.check_fields:
+            if f"{field}_id" in self.__dict__:
+                setattr(self, f"_saved_{field}_id", self.__dict__.get(f"{field}_id"))
+            else:
+                setattr(self, f"_saved_{field}", self.__dict__.get(field))
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+
+        self._save_field_values()
+
     @property
     def changed_fields(self):
-        if self.pk is None:
+        if self._state.adding:
             return None
 
-        saved = self.__class__.objects.get(pk=self.pk)
-
-        return {
-            field
-            for field in self.check_fields
-            if getattr(self, field) != getattr(saved, field)
-        }
+        _changed_fields = set()
+        for field in self.check_fields:
+            if f"_saved_{field}_id" in self.__dict__:
+                if self.__dict__.get(f"_saved_{field}_id") != self.__dict__.get(
+                    f"{field}_id"
+                ):
+                    _changed_fields.add(field)
+            else:
+                if self.__dict__.get(f"_saved_{field}") != self.__dict__.get(field):
+                    _changed_fields.add(field)
+
+        return _changed_fields
+
+    def get_saved_value(self, field):
+        return self.__dict__.get(f"_saved_{field}")

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",)