netbox-plugin-dns 1.1.0b6__py3-none-any.whl → 1.1.1__py3-none-any.whl

netbox_dns/models/record.py

@@ -10,6 +10,7 @@ from django.urls import reverse
 from django.conf import settings
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -100,7 +101,7 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Record(ObjectModificationMixin, NetBoxModel):
+class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -193,7 +194,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
     objects = RecordManager()
     raw_objects = RestrictedQuerySet.as_manager()
 
-    clone_fields = [
+    clone_fields = (
         "zone",
         "type",
         "name",
@@ -202,10 +203,20 @@ class Record(ObjectModificationMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
-    ]
+    )
 
     class Meta:
-        ordering = ("zone", "name", "type", "value", "status")
+        verbose_name = "Record"
+        verbose_name_plural = "Records"
+
+        ordering = (
+            "fqdn",
+            "zone",
+            "name",
+            "type",
+            "value",
+            "status",
+        )
 
     def __str__(self):
         try:
@@ -493,20 +504,33 @@ class Record(ObjectModificationMixin, NetBoxModel):
             **data,
         )
 
+    def update_fqdn(self, zone=None):
+        if zone is None:
+            zone = self.zone
+
+        _zone = dns_name.from_text(zone.name, origin=dns_name.root)
+        name = dns_name.from_text(self.name, origin=None)
+        fqdn = dns_name.from_text(self.name, origin=_zone)
+
+        if not fqdn.is_subdomain(_zone):
+            raise ValidationError(
+                {
+                    "name": f"{self.name} is not a name in {zone.name}",
+                }
+            )
+
+        _zone.to_unicode()
+        name.to_unicode()
+
+        self.name = name.relativize(_zone).to_text()
+        self.fqdn = fqdn.to_text()
+
     def validate_name(self, new_zone=None):
         if new_zone is None:
             new_zone = self.zone
 
         try:
-            _zone = dns_name.from_text(new_zone.name, origin=dns_name.root)
-            name = dns_name.from_text(self.name, origin=None)
-            fqdn = dns_name.from_text(self.name, origin=_zone)
-
-            _zone.to_unicode()
-            name.to_unicode()
-
-            self.name = name.relativize(_zone).to_text()
-            self.fqdn = fqdn.to_text()
+            self.update_fqdn(zone=new_zone)
 
         except dns.exception.DNSException as exc:
             raise ValidationError(
@@ -515,13 +539,6 @@ class Record(ObjectModificationMixin, NetBoxModel):
                 }
             )
 
-        if not fqdn.is_subdomain(_zone):
-            raise ValidationError(
-                {
-                    "name": f"{self.name} is not a name in {new_zone.name}",
-                }
-            )
-
         if self.type not in get_plugin_config(
             "netbox_dns", "tolerate_non_rfc1035_types", default=[]
         ):
@@ -613,6 +630,11 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if not get_plugin_config("netbox_dns", "enforce_unique_rrset_ttl", False):
             return
 
+        if self.ipam_ip_address is not None and get_plugin_config(
+            "netbox_dns", "dnssync_conflict_deactivate", False
+        ):
+            return
+
         if self.type == RecordTypeChoices.PTR and self.managed:
             return
 

netbox_dns/models/record_template.py

@@ -85,7 +85,10 @@ class RecordTemplate(NetBoxModel):
     )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Record Template"
+        verbose_name_plural = "Record Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/registrar.py

@@ -59,7 +59,13 @@ class Registrar(NetBoxModel):
         return str(self.name)
 
     class Meta:
-        ordering = ("name", "iana_id")
+        verbose_name = "Registrar"
+        verbose_name_plural = "Registrars"
+
+        ordering = (
+            "name",
+            "iana_id",
+        )
 
 
 @register_search

netbox_dns/models/{contact.py → registration_contact.py}

@@ -8,12 +8,12 @@ from taggit.managers import TaggableManager
 
 
 __all__ = (
-    "Contact",
-    "ContactIndex",
+    "RegistrationContact",
+    "RegistrationContactIndex",
 )
 
 
-class Contact(NetBoxModel):
+class RegistrationContact(NetBoxModel):
     # +
     # Data fields according to https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en
     # -
@@ -87,7 +87,7 @@ class Contact(NetBoxModel):
         related_name="netbox_dns_contact_set",
     )
 
-    clone_fields = [
+    clone_fields = (
         "name",
         "description",
         "organization",
@@ -102,10 +102,10 @@ class Contact(NetBoxModel):
         "fax_ext",
         "email",
         "tags",
-    ]
+    )
 
     def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:contact", kwargs={"pk": self.pk})
+        return reverse("plugins:netbox_dns:registrationcontact", kwargs={"pk": self.pk})
 
     def __str__(self):
         if self.name is not None:
@@ -114,7 +114,13 @@ class Contact(NetBoxModel):
         return self.contact_id
 
     class Meta:
-        ordering = ("name", "contact_id")
+        verbose_name = "Registration Contact"
+        verbose_name_plural = "Registration Contacts"
+
+        ordering = (
+            "name",
+            "contact_id",
+        )
 
     @property
     def zones(self):
@@ -127,8 +133,8 @@ class Contact(NetBoxModel):
 
 
 @register_search
-class ContactIndex(SearchIndex):
-    model = Contact
+class RegistrationContactIndex(SearchIndex):
+    model = RegistrationContact
     fields = (
         ("name", 100),
         ("contact_id", 100),

netbox_dns/models/view.py

@@ -3,6 +3,7 @@ from django.urls import reverse
 from django.core.exceptions import ValidationError
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.context import current_request
 from utilities.exceptions import AbortRequest
@@ -16,7 +17,7 @@ __all__ = (
 )
 
 
-class View(ObjectModificationMixin, NetBoxModel):
+class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -41,7 +42,10 @@ class View(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     @classmethod
     def get_default_view(cls):
@@ -54,6 +58,9 @@ class View(ObjectModificationMixin, NetBoxModel):
         return str(self.name)
 
     class Meta:
+        verbose_name = "View"
+        verbose_name_plural = "Views"
+
         ordering = ("name",)
 
     def delete(self, *args, **kwargs):

netbox_dns/models/zone.py

@@ -3,9 +3,8 @@ from math import ceil
 from datetime import datetime
 
 from dns import name as dns_name
-from dns.rdtypes.ANY import SOA
 from dns.exception import DNSException
-
+from dns.rdtypes.ANY import SOA
 from django.core.validators import (
     MinValueValidator,
     MaxValueValidator,
@@ -19,6 +18,7 @@ from django.dispatch import receiver
 from django.conf import settings
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -36,7 +36,7 @@ from netbox_dns.utilities import (
     NameFormatError,
 )
 from netbox_dns.validators import (
-    validate_fqdn,
+    validate_rname,
     validate_domain_name,
 )
 from netbox_dns.mixins import ObjectModificationMixin
@@ -69,7 +69,7 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Zone(ObjectModificationMixin, NetBoxModel):
+class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (ZoneStatusChoices.STATUS_ACTIVE,)
 
     def __init__(self, *args, **kwargs):
@@ -78,6 +78,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         super().__init__(*args, **kwargs)
 
         self._soa_serial_dirty = False
+        self._ip_addresses_checked = False
 
     view = models.ForeignKey(
         to="View",
@@ -191,7 +192,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
     registrant = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Registrant",
         help_text="The owner of the domain",
@@ -199,7 +200,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
     admin_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Admin Contact",
         related_name="admin_c_zones",
@@ -208,16 +209,16 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
     tech_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
-        verbose_name="Tech Contact",
+        verbose_name="Technical Contact",
         related_name="tech_c_zones",
         help_text="The technical contact for the domain",
         blank=True,
         null=True,
     )
     billing_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Billing Contact",
         related_name="billing_c_zones",
@@ -248,7 +249,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
 
     objects = ZoneManager()
 
-    clone_fields = [
+    clone_fields = (
         "view",
         "name",
         "status",
@@ -262,9 +263,12 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         "soa_expire",
         "soa_minimum",
         "description",
-    ]
+    )
 
     class Meta:
+        verbose_name = "Zone"
+        verbose_name_plural = "Zones"
+
         ordering = (
             "view",
             "name",
@@ -280,7 +284,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
         else:
             try:
                 name = dns_name.from_text(self.name, origin=None).to_unicode()
-            except dns_name.IDNAException:
+            except DNSException:
                 name = self.name
 
         try:
@@ -308,6 +312,14 @@ class Zone(ObjectModificationMixin, NetBoxModel):
     def soa_serial_dirty(self, soa_serial_dirty):
         self._soa_serial_dirty = soa_serial_dirty
 
+    @property
+    def ip_addresses_checked(self):
+        return self._ip_addresses_checked
+
+    @ip_addresses_checked.setter
+    def ip_addresses_checked(self, ip_addresses_checked):
+        self._ip_addresses_checked = ip_addresses_checked
+
     @property
     def display_name(self):
         return name_to_unicode(self.name)
@@ -621,7 +633,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             raise ValidationError("soa_rname not set and no default value defined")
         try:
             dns_name.from_text(self.soa_rname, origin=dns_name.root)
-            validate_fqdn(self.soa_rname)
+            validate_rname(self.soa_rname)
         except (DNSException, ValidationError) as exc:
             raise ValidationError(
                 {
@@ -641,7 +653,7 @@ class Zone(ObjectModificationMixin, NetBoxModel):
             old_zone = Zone.objects.get(pk=self.pk)
             if not self.soa_serial_auto:
                 self.check_soa_serial_increment(old_zone.soa_serial, self.soa_serial)
-            else:
+            elif not old_zone.soa_serial_auto:
                 try:
                     self.check_soa_serial_increment(
                         old_zone.soa_serial, self.get_auto_serial()
@@ -653,24 +665,26 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                         }
                     )
 
-            if old_zone.name != self.name or old_zone.view != self.view:
-                for ip_address in get_ip_addresses_by_zone(self):
-                    try:
-                        check_dns_records(ip_address, zone=self)
-                    except ValidationError as exc:
-                        raise ValidationError(exc.messages)
-
+            if (
+                not self.ip_addresses_checked
+                and old_zone.name != self.name
+                or old_zone.view != self.view
+            ):
                 ip_addresses = IPAddress.objects.filter(
                     netbox_dns_records__in=self.record_set.filter(
                         ipam_ip_address__isnull=False
                     )
                 )
-                for ip_address in ip_addresses:
+                ip_addresses |= get_ip_addresses_by_zone(self)
+
+                for ip_address in ip_addresses.distinct():
                     try:
                         check_dns_records(ip_address, zone=self)
                     except ValidationError as exc:
                         raise ValidationError(exc.messages)
 
+                self.ip_addresses_checked = True
+
         if self.is_reverse_zone:
             self.arpa_network = self.network_from_name
 
@@ -785,12 +799,13 @@ class Zone(ObjectModificationMixin, NetBoxModel):
 
         elif changed_fields is not None and {"name", "view", "status"} & changed_fields:
             for address_record in self.record_set.filter(
-                type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA)
+                type__in=(RecordTypeChoices.A, RecordTypeChoices.AAAA),
+                ipam_ip_address__isnull=True,
             ):
                 address_record.save(update_fields=["ptr_record"])
 
         if changed_fields is not None and "name" in changed_fields:
-            for _record in self.record_set.all():
+            for _record in self.record_set.filter(ipam_ip_address__isnull=True):
                 _record.save(
                     update_fields=["fqdn"],
                     save_zone_serial=False,
@@ -799,13 +814,14 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                 )
 
         if changed_fields is None or {"name", "view"} & changed_fields:
-            update_ip_addresses = IPAddress.objects.filter(
-                pk__in=self.record_set.filter(
+            ip_addresses = IPAddress.objects.filter(
+                netbox_dns_records__in=self.record_set.filter(
                     ipam_ip_address__isnull=False
-                ).values_list("ipam_ip_address", flat=True)
+                )
             )
-            update_ip_addresses |= get_ip_addresses_by_zone(self)
-            for ip_address in update_ip_addresses:
+            ip_addresses |= get_ip_addresses_by_zone(self)
+
+            for ip_address in ip_addresses.distinct():
                 update_dns_records(ip_address)
 
         self.save_soa_serial()
@@ -848,7 +864,9 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                     netbox_dns_records__in=self.record_set.filter(
                         ipam_ip_address__isnull=False
                     )
-                ).values_list("pk", flat=True)
+                )
+                .distinct()
+                .values_list("pk", flat=True)
             )
 
             super().delete(*args, **kwargs)

netbox_dns/models/zone_template.py

@@ -47,7 +47,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     registrant = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         related_name="+",
         help_text="The owner of the domain",
@@ -55,7 +55,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     admin_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Admin contact",
         related_name="+",
@@ -64,7 +64,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     tech_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Tech contact",
         related_name="+",
@@ -73,7 +73,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
     billing_c = models.ForeignKey(
-        to="Contact",
+        to="RegistrationContact",
         on_delete=models.SET_NULL,
         verbose_name="Billing contact",
         related_name="+",
@@ -82,7 +82,7 @@ class ZoneTemplate(NetBoxModel):
         null=True,
     )
 
-    clone_fields = [
+    clone_fields = (
         "description",
         "nameservers",
         "record_templates",
@@ -92,19 +92,22 @@ class ZoneTemplate(NetBoxModel):
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
-    template_fields = [
+    template_fields = (
         "tenant",
         "registrar",
         "registrant",
         "admin_c",
         "tech_c",
         "billing_c",
-    ]
+    )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Zone Template"
+        verbose_name_plural = "Zone Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/navigation.py

@@ -151,21 +151,21 @@ registrar_menu_item = PluginMenuItem(
 )
 
 contact_menu_item = PluginMenuItem(
-    link="plugins:netbox_dns:contact_list",
-    link_text="Contacts",
-    permissions=["netbox_dns.view_contact"],
+    link="plugins:netbox_dns:registrationcontact_list",
+    link_text="Registration Contacts",
+    permissions=["netbox_dns.view_registrationcontact"],
     buttons=(
         PluginMenuButton(
-            "plugins:netbox_dns:contact_add",
+            "plugins:netbox_dns:registrationcontact_add",
             "Add",
             "mdi mdi-plus-thick",
-            permissions=["netbox_dns.add_contact"],
+            permissions=["netbox_dns.add_registrationcontact"],
         ),
         PluginMenuButton(
-            "plugins:netbox_dns:contact_import",
+            "plugins:netbox_dns:registrationcontact_import",
             "Import",
             "mdi mdi-upload",
-            permissions=["netbox_dns.add_contact"],
+            permissions=["netbox_dns.add_registrationcontact"],
         ),
     ),
 )

netbox_dns/signals/ipam_dnssync.py

@@ -215,6 +215,10 @@ def ipam_dnssync_view_prefix_changed(**kwargs):
         return
 
     check_view = action != "post_remove"
+
+    ip_addresses = IPAddress.objects.none()
     for prefix in Prefix.objects.filter(pk__in=kwargs.get("pk_set")):
-        for ip_address in get_ip_addresses_by_prefix(prefix, check_view=check_view):
-            update_dns_records(ip_address)
+        ip_addresses |= get_ip_addresses_by_prefix(prefix, check_view=check_view)
+
+    for ip_address in ip_addresses.distinct():
+        update_dns_records(ip_address)

netbox_dns/tables/__init__.py

@@ -2,7 +2,7 @@ from .view import *
 from .zone import *
 from .nameserver import *
 from .record import *
-from .contact import *
+from .registration_contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *

netbox_dns/tables/nameserver.py

@@ -22,13 +22,7 @@ class NameServerTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = NameServer
-        fields = (
-            "name",
-            "description",
-            "tags",
-            "tenant",
-            "tenant_group",
-        )
+        fields = ("description",)
         default_columns = (
             "name",
             "tags",