netbox-plugin-dns 1.1.0__py3-none-any.whl → 1.1.0b1__py3-none-any.whl

netbox_dns/management/commands/{setup_dnssync.py → setup_autodns.py}

@@ -7,7 +7,7 @@ from ipam.models import IPAddress
 
 
 class Command(BaseCommand):
-    help = "Setup IPAddress custom fields for IPAM DNSsync"
+    help = "Setup IPAddress custom fields for IPAM AutoDNS"
 
     def add_arguments(self, parser):
         parser.add_argument(
@@ -19,7 +19,7 @@ class Command(BaseCommand):
 
         if options.get("remove"):
             if options.get("verbosity"):
-                self.stdout.write("Trying to remove IPAM DNSsync custom fields")
+                self.stdout.write(f"Trying to remove IPAM AutoDNS custom fields")
             for cf in (
                 "ipaddress_dns_disabled",
                 "ipaddress_dns_record_ttl",
@@ -29,8 +29,8 @@ class Command(BaseCommand):
                     CustomField.objects.get(
                         name=cf, object_types=ipaddress_object_type
                     ).delete()
-                    if options.get("verbosity"):
-                        self.stdout.write(f"Removed custom field '{cf}'")
+                    if options.get("verbosity") >= 2:
+                        self.stdout.write(f"Custom field '{cf}' removed")
                 except CustomField.DoesNotExist:
                     pass
             return
@@ -38,8 +38,8 @@ class Command(BaseCommand):
         # +
         # Remove pre-existing IPAM Coupling custom fields
         # -
-        if options.get("verbosity") >= 2:
-            self.stdout.write("Trying to remove obsolete IPAM Coupling custom fields")
+        if options.get("verbosity"):
+            self.stdout.write(f"Trying to remove obsolete IPAM Coupling custom fields")
         for cf in (
             "ipaddress_dns_record_name",
             "ipaddress_dns_zone_id",
@@ -48,47 +48,39 @@ class Command(BaseCommand):
                 CustomField.objects.get(
                     name=cf, object_types=ipaddress_object_type
                 ).delete()
-                if options.get("verbosity"):
+                if options.get("verbosity") >= 2:
                     self.stdout.write(f"Removed custom field '{cf}'")
             except CustomField.DoesNotExist:
                 pass
 
-        if options.get("verbosity") >= 2:
-            self.stdout.write("Creating IPAM DNSsync custom fields")
+        if options.get("verbosity"):
+            self.stdout.write(f"Creating IPAM AutoDNS custom fields")
 
         if not CustomField.objects.filter(
             name="ipaddress_dns_disabled",
             type=CustomFieldTypeChoices.TYPE_BOOLEAN,
             object_types=ipaddress_object_type,
         ).exists():
-            cf_dnssync_disabled = CustomField.objects.create(
+            cf_disable_ptr = CustomField.objects.create(
                 name="ipaddress_dns_disabled",
-                label="Disable DNSsync",
+                label="Disable AutoDNS",
                 description="Disable DNS address and pointer record generation for this address",
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
                 required=False,
                 default=False,
-                group_name="DNSsync",
+                group_name="AutoDNS",
                 is_cloneable=True,
                 weight=100,
             )
-            cf_dnssync_disabled.object_types.set([ipaddress_object_type])
-            if options.get("verbosity"):
+            cf_disable_ptr.object_types.set([ipaddress_object_type])
+            if options.get("verbosity") >= 2:
                 self.stdout.write("Created custom field 'ipaddress_dns_disabled'")
 
-        try:
-            cf_ttl = CustomField.objects.get(
-                name="ipaddress_dns_record_ttl",
-                type=CustomFieldTypeChoices.TYPE_INTEGER,
-                object_types=ipaddress_object_type,
-            )
-            if cf_ttl.group_name != "DNSsync":
-                cf_ttl.group_name = "DNSsync"
-                cf_ttl.description = ("TTL for DNS records created for this address",)
-                cf_ttl.save()
-                if options.get("verbosity"):
-                    self.stdout.write("Updated custom field 'ipaddress_dns_record_ttl'")
-        except CustomField.DoesNotExist:
+        if not CustomField.objects.filter(
+            name="ipaddress_dns_record_ttl",
+            type=CustomFieldTypeChoices.TYPE_INTEGER,
+            object_types=ipaddress_object_type,
+        ).exists():
             cf_ttl = CustomField.objects.create(
                 name="ipaddress_dns_record_ttl",
                 description="TTL for DNS records created for this address",
@@ -97,31 +89,19 @@ class Command(BaseCommand):
                 validation_minimum=0,
                 validation_maximum=2147483647,
                 required=False,
-                group_name="DNSsync",
+                group_name="AutoDNS",
                 is_cloneable=True,
                 weight=200,
             )
             cf_ttl.object_types.set([ipaddress_object_type])
-            if options.get("verbosity"):
+            if options.get("verbosity") >= 2:
                 self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
-        try:
-            cf_disable_ptr = CustomField.objects.get(
-                name="ipaddress_dns_record_disable_ptr",
-                type=CustomFieldTypeChoices.TYPE_BOOLEAN,
-                object_types=ipaddress_object_type,
-            )
-            if cf_disable_ptr.group_name != "DNSsync":
-                cf_disable_ptr.group_name = "DNSsync"
-                cf_disable_ptr.description = (
-                    "Disable DNS PTR record generation for this address",
-                )
-                cf_disable_ptr.save()
-                if options.get("verbosity"):
-                    self.stdout.write(
-                        "Updated custom field 'ipaddress_dns_record_disable_ptr'"
-                    )
-        except CustomField.DoesNotExist:
+        if not CustomField.objects.filter(
+            name="ipaddress_dns_record_disable_ptr",
+            type=CustomFieldTypeChoices.TYPE_BOOLEAN,
+            object_types=ipaddress_object_type,
+        ).exists():
             cf_disable_ptr = CustomField.objects.create(
                 name="ipaddress_dns_record_disable_ptr",
                 description="Disable DNS PTR record generation for this address",
@@ -129,12 +109,12 @@ class Command(BaseCommand):
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
                 required=False,
                 default=False,
-                group_name="DNSsync",
+                group_name="AutoDNS",
                 is_cloneable=True,
                 weight=300,
             )
             cf_disable_ptr.object_types.set([ipaddress_object_type])
-            if options.get("verbosity"):
+            if options.get("verbosity") >= 2:
                 self.stdout.write(
                     "Created custom field 'ipaddress_dns_record_disable_ptr'"
                 )

netbox_dns/migrations/{0008_view_prefixes.py → 0007_view_prefixes.py}

@@ -4,7 +4,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
     dependencies = [
         ("ipam", "0067_ipaddress_index_host"),
-        ("netbox_dns", "0007_alter_ordering_options"),
+        ("netbox_dns", "0006_templating"),
     ]
 
     operations = [

netbox_dns/models/__init__.py

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

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

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

netbox_dns/models/nameserver.py

@@ -7,7 +7,6 @@ from django.urls import reverse
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
-from netbox.models.features import ContactsMixin
 
 from netbox_dns.utilities import (
     name_to_unicode,
@@ -27,7 +26,7 @@ __all__ = (
 )
 
 
-class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+class NameServer(ObjectModificationMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -44,17 +43,13 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "name",
-        "description",
-    )
+    clone_fields = ["name", "description"]
 
     class Meta:
+        ordering = ("name",)
         verbose_name = "Nameserver"
         verbose_name_plural = "Nameservers"
 
-        ordering = ("name",)
-
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()

netbox_dns/models/record.py

@@ -10,7 +10,6 @@ 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
@@ -59,7 +58,7 @@ def record_data_from_ip_address(ip_address, zone):
             RecordStatusChoices.STATUS_ACTIVE
             if ip_address.status
             in settings.PLUGINS_CONFIG["netbox_dns"].get(
-                "dnssync_ipaddress_active_status", []
+                "autodns_ipaddress_active_status", []
             )
             else RecordStatusChoices.STATUS_INACTIVE
         ),
@@ -101,7 +100,7 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+class Record(ObjectModificationMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -194,7 +193,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     objects = RecordManager()
     raw_objects = RestrictedQuerySet.as_manager()
 
-    clone_fields = (
+    clone_fields = [
         "zone",
         "type",
         "name",
@@ -203,20 +202,10 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
-    )
+    ]
 
     class Meta:
-        verbose_name = "Record"
-        verbose_name_plural = "Records"
-
-        ordering = (
-            "fqdn",
-            "zone",
-            "name",
-            "type",
-            "value",
-            "status",
-        )
+        ordering = ("zone", "name", "type", "value", "status")
 
     def __str__(self):
         try:
@@ -472,11 +461,8 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
                 self.rfc2317_cname_record.delete(save_zone_serial=save_zone_serial)
                 self.rfc2317_cname_record = None
 
-    def update_from_ip_address(self, ip_address, zone=None):
-        if zone is None:
-            zone = self.zone
-
-        data = record_data_from_ip_address(ip_address, zone)
+    def update_from_ip_address(self, ip_address):
+        data = record_data_from_ip_address(ip_address, self.zone)
 
         if data is None:
             self.delete()
@@ -504,38 +490,29 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             **data,
         )
 
-    def update_fqdn(self, zone=None):
-        if zone is None:
-            zone = self.zone
+    def validate_name(self):
+        try:
+            _zone = dns_name.from_text(self.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()
 
-        _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)
+            self.name = name.relativize(_zone).to_text()
+            self.fqdn = fqdn.to_text()
 
-        if not fqdn.is_subdomain(_zone):
+        except dns.exception.DNSException as exc:
             raise ValidationError(
                 {
-                    "name": f"{self.name} is not a name in {zone.name}",
+                    "name": str(exc),
                 }
             )
 
-        _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:
-            self.update_fqdn(zone=new_zone)
-
-        except dns.exception.DNSException as exc:
+        if not fqdn.is_subdomain(_zone):
             raise ValidationError(
                 {
-                    "name": str(exc),
+                    "name": f"{self.name} is not a name in {self.zone.name}",
                 }
             )
 
@@ -567,18 +544,15 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         except ValidationError as exc:
             raise ValidationError({"value": exc}) from None
 
-    def check_unique_record(self, new_zone=None):
+    def check_unique_record(self):
         if not get_plugin_config("netbox_dns", "enforce_unique_records", False):
             return
 
         if not self.is_active:
             return
 
-        if new_zone is None:
-            new_zone = self.zone
-
         records = Record.objects.filter(
-            zone=new_zone,
+            zone=self.zone,
             name=self.name,
             type=self.type,
             value=self.value,
@@ -588,41 +562,13 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         if self.pk is not None:
             records = records.exclude(pk=self.pk)
 
-        if records.exists():
-            if self.ipam_ip_address is not None:
-                if not records.filter(
-                    ipam_ip_address__isnull=True
-                ).exists() or get_plugin_config(
-                    "netbox_dns", "dnssync_conflict_deactivate", False
-                ):
-                    return
-
+        if len(records):
             raise ValidationError(
                 {
                     "value": f"There is already an active {self.type} record for name {self.name} in zone {self.zone} with value {self.value}."
                 }
             ) from None
 
-    def handle_conflicting_address_records(self):
-        if self.ipam_ip_address is None or not self.is_active:
-            return
-
-        if not get_plugin_config("netbox_dns", "dnssync_conflict_deactivate", False):
-            return
-
-        records = Record.objects.filter(
-            zone=self.zone,
-            name=self.name,
-            type=self.type,
-            value=self.value,
-            status__in=Record.ACTIVE_STATUS_LIST,
-            ipam_ip_address__isnull=True,
-        )
-
-        for record in records:
-            record.status = RecordStatusChoices.STATUS_INACTIVE
-            record.save(update_fields=["status"])
-
     def check_unique_rrset_ttl(self):
         if self.pk is not None:
             return
@@ -630,11 +576,6 @@ class Record(ObjectModificationMixin, ContactsMixin, 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
 
@@ -646,16 +587,12 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             )
             .exclude(ttl=self.ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
-            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
-        if self.ipam_ip_address is not None:
-            records = records.exclude(ipam_ip_address__isnull=False)
-
         if not records.exists():
             return
 
-        conflicting_ttls = ", ".join({str(record.ttl) for record in records})
+        conflicting_ttls = ", ".join(set(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})."
@@ -684,7 +621,6 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             .exclude(pk=self.pk)
             .exclude(ttl=ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
-            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
         for record in records:
@@ -695,10 +631,10 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         self.type = self.type.upper()
         super().clean_fields(*args, **kwargs)
 
-    def clean(self, *args, new_zone=None, **kwargs):
-        self.validate_name(new_zone=new_zone)
+    def clean(self, *args, **kwargs):
+        self.validate_name()
         self.validate_value()
-        self.check_unique_record(new_zone=new_zone)
+        self.check_unique_record()
         if self.pk is None:
             self.check_unique_rrset_ttl()
 
@@ -804,7 +740,6 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
             self.ip_address = None
 
         if self.is_address_record:
-            self.handle_conflicting_address_records()
             self.update_ptr_record(
                 update_rfc2317_cname=update_rfc2317_cname,
                 save_zone_serial=save_zone_serial,

netbox_dns/models/record_template.py

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

netbox_dns/models/registrar.py

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

netbox_dns/models/view.py

@@ -3,7 +3,6 @@ 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
@@ -17,7 +16,7 @@ __all__ = (
 )
 
 
-class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
+class View(ObjectModificationMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -42,10 +41,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = (
-        "name",
-        "description",
-    )
+    clone_fields = ["name", "description"]
 
     @classmethod
     def get_default_view(cls):
@@ -58,9 +54,6 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         return str(self.name)
 
     class Meta:
-        verbose_name = "View"
-        verbose_name_plural = "Views"
-
         ordering = ("name",)
 
     def delete(self, *args, **kwargs):