netbox-plugin-dns 1.3b1__py3-none-any.whl → 1.3.1__py3-none-any.whl

netbox_dns/models/record.py

@@ -28,7 +28,6 @@ from netbox_dns.choices import (
     RecordClassChoices,
 )
 
-
 __all__ = (
     "Record",
     "RecordIndex",
@@ -115,6 +114,52 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
 
 
 class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("Record")
+        verbose_name_plural = _("Records")
+
+        ordering = (
+            "fqdn",
+            "zone",
+            "name",
+            "type",
+            "value",
+            "status",
+        )
+
+    objects = RecordManager()
+    raw_objects = RestrictedQuerySet.as_manager()
+
+    clone_fields = (
+        "zone",
+        "type",
+        "name",
+        "value",
+        "status",
+        "ttl",
+        "disable_ptr",
+        "description",
+        "tenant",
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self._cleanup_ptr_record = None
+
+    def __str__(self):
+        try:
+            fqdn = dns_name.from_text(
+                self.name, origin=dns_name.from_text(self.zone.name)
+            ).relativize(dns_name.root)
+            name = fqdn.to_unicode()
+        except dns_name.IDNAException:
+            name = fqdn.to_text()
+        except dns_name.LabelTooLong:
+            name = f"{self.name[:59]}..."
+
+        return f"{name} [{self.type}]"
+
     unique_ptr_qs = Q(
         Q(disable_ptr=False),
         Q(Q(type=RecordTypeChoices.A) | Q(type=RecordTypeChoices.AAAA)),
@@ -165,11 +210,11 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=False,
         default=False,
     )
-    ptr_record = models.OneToOneField(
+    ptr_record = models.ForeignKey(
         verbose_name=_("PTR Record"),
         to="self",
         on_delete=models.SET_NULL,
-        related_name="address_record",
+        related_name="address_records",
         null=True,
         blank=True,
     )
@@ -214,46 +259,13 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         blank=True,
     )
 
-    objects = RecordManager()
-    raw_objects = RestrictedQuerySet.as_manager()
-
-    clone_fields = (
-        "zone",
-        "type",
-        "name",
-        "value",
-        "status",
-        "ttl",
-        "disable_ptr",
-        "description",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("Record")
-        verbose_name_plural = _("Records")
-
-        ordering = (
-            "fqdn",
-            "zone",
-            "name",
-            "type",
-            "value",
-            "status",
-        )
-
-    def __str__(self):
-        try:
-            fqdn = dns_name.from_text(
-                self.name, origin=dns_name.from_text(self.zone.name)
-            ).relativize(dns_name.root)
-            name = fqdn.to_unicode()
-        except dns_name.IDNAException:
-            name = fqdn.to_text()
-        except dns_name.LabelTooLong:
-            name = f"{self.name[:59]}..."
+    @property
+    def cleanup_ptr_record(self):
+        return self._cleanup_ptr_record
 
-        return f"{name} [{self.type}]"
+    @cleanup_ptr_record.setter
+    def cleanup_ptr_record(self, ptr_record):
+        self._cleanup_ptr_record = ptr_record
 
     @property
     def display_name(self):
@@ -348,6 +360,21 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def is_delegation_record(self):
         return self in self.zone.delegation_records
 
+    def refresh_ptr_record(
+        self, ptr_record=None, update_rfc2317_cname=True, save_zone_serial=True
+    ):
+        if ptr_record is None:
+            return
+
+        if not ptr_record.address_records.exists():
+            if ptr_record.rfc2317_cname_record is not None:
+                ptr_record.remove_from_rfc2317_cname_record()
+
+            ptr_record.delete(save_zone_serial=save_zone_serial)
+
+        elif update_rfc2317_cname:
+            ptr_record.update_rfc2317_cname_record(save_zone_serial=save_zone_serial)
+
     def update_ptr_record(self, update_rfc2317_cname=True, save_zone_serial=True):
         ptr_zone = self.ptr_zone
 
@@ -357,10 +384,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             or not self.is_active
             or self.name.startswith("*")
         ):
-            if self.ptr_record is not None:
-                with transaction.atomic():
-                    self.ptr_record.delete()
-                    self.ptr_record = None
+            self.cleanup_ptr_record = self.ptr_record
+            self.ptr_record = None
             return
 
         if ptr_zone.is_rfc2317_zone:
@@ -373,7 +398,14 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             )
 
         ptr_value = self.fqdn
-        ptr_record = self.ptr_record
+        if ptr_record := self.ptr_record:
+            if (
+                ptr_record.zone == ptr_zone
+                and ptr_record.name == ptr_name
+                and ptr_record.value == ptr_value
+                and ptr_record.ttl == self.ttl
+            ):
+                return
 
         if ptr_record is not None:
             if (
@@ -384,24 +416,36 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                     save_zone_serial=save_zone_serial
                 )
 
+        try:
+            ptr_record = Record.objects.get(
+                name=ptr_name,
+                zone=ptr_zone,
+                type=RecordTypeChoices.PTR,
+                value=ptr_value,
+            )
+        except Record.DoesNotExist:
+            pass
+
         with transaction.atomic():
             if ptr_record is not None:
                 if ptr_record.zone.pk != ptr_zone.pk:
                     if ptr_record.rfc2317_cname_record is not None:
                         ptr_record.rfc2317_cname_record.delete()
-                    ptr_record.delete(save_zone_serial=save_zone_serial)
-                    ptr_record = None
+                        ptr_record.rfc2317_cname_record = None
+
+                if ptr_record.address_records.count() == 1:
+                    ptr_record.zone = ptr_zone
+                    ptr_record.name = ptr_name
+                    ptr_record.value = ptr_value
+                    ptr_record.ttl = self.ttl
+                    ptr_record.save(
+                        update_rfc2317_cname=update_rfc2317_cname,
+                        save_zone_serial=save_zone_serial,
+                    )
 
                 else:
-                    if (
-                        ptr_record.name != ptr_name
-                        or ptr_record.value != ptr_value
-                        or ptr_record.ttl != self.ttl
-                    ):
-                        ptr_record.name = ptr_name
-                        ptr_record.value = ptr_value
-                        ptr_record.ttl = self.ttl
-                        ptr_record.save(save_zone_serial=save_zone_serial)
+                    self.ptr_record = ptr_record
+                    return
 
             if ptr_record is None:
                 ptr_record = Record(
@@ -905,13 +949,19 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 save_zone_serial=save_zone_serial,
             )
         elif self.ptr_record is not None:
-            self.ptr_record.delete()
+            self.cleanup_ptr_record = self.ptr_record
             self.ptr_record = None
 
         changed_fields = self.changed_fields
         if changed_fields is None or changed_fields:
             super().save(*args, **kwargs)
 
+            self.refresh_ptr_record(
+                self.cleanup_ptr_record,
+                update_rfc2317_cname=update_rfc2317_cname,
+                save_zone_serial=save_zone_serial,
+            )
+
             if self.type != RecordTypeChoices.SOA and self.zone.soa_serial_auto:
                 self.zone.update_serial(save_zone_serial=save_zone_serial)
 
@@ -919,11 +969,16 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if self.rfc2317_cname_record:
             self.remove_from_rfc2317_cname_record(save_zone_serial=save_zone_serial)
 
-        if self.ptr_record:
-            self.ptr_record.delete()
+        ptr_record = self.ptr_record
 
         super().delete(*args, **kwargs)
 
+        self.refresh_ptr_record(
+            ptr_record,
+            update_rfc2317_cname=True,
+            save_zone_serial=save_zone_serial,
+        )
+
         _zone = self.zone
         if _zone.soa_serial_auto:
             _zone.update_serial(save_zone_serial=save_zone_serial)
@@ -932,6 +987,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class RecordIndex(SearchIndex):
     model = Record
+
     fields = (
         ("fqdn", 100),
         ("name", 120),

netbox_dns/models/record_template.py

@@ -22,6 +22,35 @@ __all__ = (
 
 
 class RecordTemplate(NetBoxModel):
+    class Meta:
+        verbose_name = _("Record Template")
+        verbose_name_plural = _("Record Templates")
+
+        ordering = ("name",)
+
+    clone_fields = (
+        "record_name",
+        "description",
+        "type",
+        "value",
+        "status",
+        "ttl",
+        "disable_ptr",
+        "tenant",
+    )
+
+    template_fields = (
+        "type",
+        "value",
+        "status",
+        "ttl",
+        "disable_ptr",
+        "tenant",
+    )
+
+    def __str__(self):
+        return str(self.name)
+
     name = models.CharField(
         verbose_name=_("Template Name"),
         unique=True,
@@ -71,35 +100,6 @@ class RecordTemplate(NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "record_name",
-        "description",
-        "type",
-        "value",
-        "status",
-        "ttl",
-        "disable_ptr",
-        "tenant",
-    )
-
-    template_fields = (
-        "type",
-        "value",
-        "status",
-        "ttl",
-        "disable_ptr",
-        "tenant",
-    )
-
-    class Meta:
-        verbose_name = _("Record Template")
-        verbose_name_plural = _("Record Templates")
-
-        ordering = ("name",)
-
-    def __str__(self):
-        return str(self.name)
-
     def get_status_color(self):
         return RecordStatusChoices.colors.get(self.status)
 
@@ -186,6 +186,7 @@ class RecordTemplate(NetBoxModel):
 @register_search
 class RecordTemplateIndex(SearchIndex):
     model = RecordTemplate
+
     fields = (
         ("name", 100),
         ("record_name", 120),

netbox_dns/models/registrar.py

@@ -12,6 +12,18 @@ __all__ = (
 
 
 class Registrar(NetBoxModel):
+    class Meta:
+        verbose_name = _("Registrar")
+        verbose_name_plural = _("Registrars")
+
+        ordering = (
+            "name",
+            "iana_id",
+        )
+
+    def __str__(self):
+        return str(self.name)
+
     # +
     # Data fields according to https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en
     # -
@@ -56,22 +68,11 @@ class Registrar(NetBoxModel):
         blank=True,
     )
 
-    def __str__(self):
-        return str(self.name)
-
-    class Meta:
-        verbose_name = _("Registrar")
-        verbose_name_plural = _("Registrars")
-
-        ordering = (
-            "name",
-            "iana_id",
-        )
-
 
 @register_search
 class RegistrarIndex(SearchIndex):
     model = Registrar
+
     fields = (
         ("name", 100),
         ("iana_id", 100),

netbox_dns/models/registration_contact.py

@@ -14,6 +14,38 @@ __all__ = (
 
 
 class RegistrationContact(NetBoxModel):
+    class Meta:
+        verbose_name = _("Registration Contact")
+        verbose_name_plural = _("Registration Contacts")
+
+        ordering = (
+            "name",
+            "contact_id",
+        )
+
+    clone_fields = (
+        "name",
+        "description",
+        "organization",
+        "street",
+        "city",
+        "state_province",
+        "postal_code",
+        "country",
+        "phone",
+        "phone_ext",
+        "fax",
+        "fax_ext",
+        "email",
+        "tags",
+    )
+
+    def __str__(self):
+        if self.name is not None:
+            return f"{self.contact_id} ({self.name})"
+
+        return self.contact_id
+
     # +
     # Data fields according to https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en
     # -
@@ -100,38 +132,6 @@ class RegistrationContact(NetBoxModel):
         related_name="netbox_dns_contact_set",
     )
 
-    clone_fields = (
-        "name",
-        "description",
-        "organization",
-        "street",
-        "city",
-        "state_province",
-        "postal_code",
-        "country",
-        "phone",
-        "phone_ext",
-        "fax",
-        "fax_ext",
-        "email",
-        "tags",
-    )
-
-    def __str__(self):
-        if self.name is not None:
-            return f"{self.contact_id} ({self.name})"
-
-        return self.contact_id
-
-    class Meta:
-        verbose_name = _("Registration Contact")
-        verbose_name_plural = _("Registration Contacts")
-
-        ordering = (
-            "name",
-            "contact_id",
-        )
-
     @property
     def zones(self):
         return (
@@ -145,6 +145,7 @@ class RegistrationContact(NetBoxModel):
 @register_search
 class RegistrationContactIndex(SearchIndex):
     model = RegistrationContact
+
     fields = (
         ("name", 100),
         ("contact_id", 100),

netbox_dns/models/view.py

@@ -25,6 +25,21 @@ __all__ = (
 
 
 class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("View")
+        verbose_name_plural = _("Views")
+
+        ordering = ("name",)
+
+    clone_fields = (
+        "name",
+        "description",
+        "tenant",
+    )
+
+    def __str__(self):
+        return str(self.name)
+
     name = models.CharField(
         verbose_name=_("Name"),
         unique=True,
@@ -60,25 +75,10 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "name",
-        "description",
-        "tenant",
-    )
-
     @classmethod
     def get_default_view(cls):
         return cls.objects.get(default_view=True)
 
-    def __str__(self):
-        return str(self.name)
-
-    class Meta:
-        verbose_name = _("View")
-        verbose_name_plural = _("Views")
-
-        ordering = ("name",)
-
     def delete(self, *args, **kwargs):
         if self.default_view:
             if current_request.get() is not None:
@@ -156,6 +156,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class ViewIndex(SearchIndex):
     model = View
+
     fields = (
         ("name", 100),
         ("description", 500),