netbox-plugin-dns 1.2.9__py3-none-any.whl → 1.3b2__py3-none-any.whl

netbox_dns/models/nameserver.py

@@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.db.models import Q, UniqueConstraint
 from django.db.models.functions import Lower
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -29,31 +28,6 @@ __all__ = (
 
 
 class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
-    name = models.CharField(
-        verbose_name=_("Name"),
-        max_length=255,
-        db_collation="natural_sort",
-    )
-    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",
-        blank=True,
-        null=True,
-    )
-
-    clone_fields = (
-        "name",
-        "description",
-        "tenant",
-    )
-
     class Meta:
         verbose_name = _("Nameserver")
         verbose_name_plural = _("Nameservers")
@@ -70,20 +44,41 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             ),
         ]
 
+    clone_fields = (
+        "name",
+        "description",
+        "tenant",
+    )
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()
         except dns_name.IDNAException:
             return self.name
 
+    name = models.CharField(
+        verbose_name=_("Name"),
+        max_length=255,
+        db_collation="natural_sort",
+    )
+    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",
+        blank=True,
+        null=True,
+    )
+
     @property
     def display_name(self):
         return name_to_unicode(self.name)
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
-
     def clean_fields(self, exclude=None):
         if get_plugin_config("netbox_dns", "convert_names_to_lowercase", False):
             self.name = self.name.lower()
@@ -143,6 +138,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class NameServerIndex(SearchIndex):
     model = NameServer
+
     fields = (
         ("name", 100),
         ("description", 500),

netbox_dns/models/record.py

@@ -8,7 +8,6 @@ from dns import rdata
 from django.core.exceptions import ValidationError
 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 _
 
@@ -116,6 +115,47 @@ 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 __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)),
@@ -215,47 +255,6 @@ 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]}..."
-
-        return f"{name} [{self.type}]"
-
     @property
     def display_name(self):
         return name_to_unicode(self.name)
@@ -263,10 +262,6 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_status_color(self):
         return RecordStatusChoices.colors.get(self.status)
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:record", kwargs={"pk": self.pk})
-
     @property
     def value_fqdn(self):
         if self.type not in (RecordTypeChoices.CNAME, RecordTypeChoices.NS):
@@ -937,6 +932,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class RecordIndex(SearchIndex):
     model = Record
+
     fields = (
         ("fqdn", 100),
         ("name", 120),

netbox_dns/models/record_template.py

@@ -3,7 +3,6 @@ from dns import name as dns_name
 
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -23,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,
@@ -72,42 +100,9 @@ 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)
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:recordtemplate", kwargs={"pk": self.pk})
-
     def validate_name(self):
         try:
             name = dns_name.from_text(self.record_name, origin=None)
@@ -191,6 +186,7 @@ class RecordTemplate(NetBoxModel):
 @register_search
 class RecordTemplateIndex(SearchIndex):
     model = RecordTemplate
+
     fields = (
         ("name", 100),
         ("record_name", 120),

netbox_dns/models/registrar.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -13,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
     # -
@@ -57,26 +68,11 @@ class Registrar(NetBoxModel):
         blank=True,
     )
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:registrar", kwargs={"pk": self.pk})
-
-    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

@@ -1,5 +1,4 @@
 from django.db import models
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from netbox.models import NetBoxModel
@@ -15,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
     # -
@@ -101,42 +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",
-    )
-
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:registrationcontact", kwargs={"pk": self.pk})
-
-    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 (
@@ -150,6 +145,7 @@ class RegistrationContact(NetBoxModel):
 @register_search
 class RegistrationContactIndex(SearchIndex):
     model = RegistrationContact
+
     fields = (
         ("name", 100),
         ("contact_id", 100),

netbox_dns/models/view.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
@@ -26,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,
@@ -61,29 +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)
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:view", kwargs={"pk": self.pk})
-
-    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:
@@ -161,6 +156,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
 @register_search
 class ViewIndex(SearchIndex):
     model = View
+
     fields = (
         ("name", 100),
         ("description", 500),

netbox_dns/models/zone.py

@@ -14,7 +14,6 @@ from django.db import models, transaction
 from django.db.models import Q, Max, ExpressionWrapper, BooleanField, UniqueConstraint
 from django.db.models.functions import Length, Lower
 from django.db.models.signals import m2m_changed
-from django.urls import reverse
 from django.dispatch import receiver
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
@@ -83,6 +82,80 @@ class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
 
 
 class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+    class Meta:
+        verbose_name = _("Zone")
+        verbose_name_plural = _("Zones")
+
+        ordering = (
+            "view",
+            "name",
+        )
+
+        constraints = [
+            UniqueConstraint(
+                Lower("name"),
+                "view",
+                name="name_view_unique_ci",
+                violation_error_message=_(
+                    "There is already a zone with the same name in this view"
+                ),
+            ),
+        ]
+
+    clone_fields = (
+        "view",
+        "name",
+        "description",
+        "status",
+        "nameservers",
+        "default_ttl",
+        "soa_ttl",
+        "soa_mname",
+        "soa_rname",
+        "soa_refresh",
+        "soa_retry",
+        "soa_expire",
+        "soa_minimum",
+        "tenant",
+    )
+
+    soa_clean_fields = {
+        "description",
+        "status",
+        "dnssec_policy",
+        "inline_signing",
+        "parental_agents",
+        "registrar",
+        "registry_domain_id",
+        "expiration_date",
+        "domain_status",
+        "registrant",
+        "admin_c",
+        "tech_c",
+        "billing_c",
+        "rfc2317_parent_managed",
+        "tenant",
+    }
+
+    objects = ZoneManager()
+
+    def __str__(self):
+        if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+            name = ". (root zone)"
+        else:
+            try:
+                name = dns_name.from_text(self.name, origin=None).to_unicode()
+            except DNSException:
+                name = self.name
+
+        try:
+            if not self.view.default_view:
+                return f"[{self.view}] {name}"
+        except ObjectDoesNotExist:
+            return f"[<no view assigned>] {name}"
+
+        return str(name)
+
     def __init__(self, *args, **kwargs):
         kwargs.pop("template", None)
 
@@ -295,78 +368,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    objects = ZoneManager()
-
-    clone_fields = (
-        "view",
-        "name",
-        "description",
-        "status",
-        "nameservers",
-        "default_ttl",
-        "soa_ttl",
-        "soa_mname",
-        "soa_rname",
-        "soa_refresh",
-        "soa_retry",
-        "soa_expire",
-        "soa_minimum",
-        "tenant",
-    )
-
-    soa_clean_fields = {
-        "description",
-        "status",
-        "dnssec_policy",
-        "inline_signing",
-        "registrar",
-        "registry_domain_id",
-        "expiration_date",
-        "domain_status",
-        "registrant",
-        "admin_c",
-        "tech_c",
-        "billing_c",
-        "rfc2317_parent_managed",
-        "tenant",
-    }
-
-    class Meta:
-        verbose_name = _("Zone")
-        verbose_name_plural = _("Zones")
-
-        ordering = (
-            "view",
-            "name",
-        )
-        constraints = [
-            UniqueConstraint(
-                Lower("name"),
-                "view",
-                name="name_view_unique_ci",
-                violation_error_message=_(
-                    "There is already a zone with the same name in this view"
-                ),
-            ),
-        ]
-
-    def __str__(self):
-        if self.name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-            name = ". (root zone)"
-        else:
-            try:
-                name = dns_name.from_text(self.name, origin=None).to_unicode()
-            except DNSException:
-                name = self.name
-
-        try:
-            if not self.view.default_view:
-                return f"[{self.view}] {name}"
-        except ObjectDoesNotExist:
-            return f"[<no view assigned>] {name}"
-
-        return str(name)
-
     @property
     def fqdn(self):
         return f"{self.name}."
@@ -416,10 +417,6 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     def get_domain_status_color(self):
         return ZoneEPPStatusChoices.colors.get(self.domain_status)
 
-    # TODO: Remove in version 1.3.0 (NetBox #18555)
-    def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:zone", kwargs={"pk": self.pk})
-
     def get_status_class(self):
         return self.CSS_CLASSES.get(self.status)
 
@@ -1112,6 +1109,7 @@ def update_ns_records(**kwargs):
 @register_search
 class ZoneIndex(SearchIndex):
     model = Zone
+
     fields = (
         ("name", 100),
         ("view", 150),