netbox-plugin-dns 1.1.0b1__tar.gz → 1.1b3__tar.gz

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b1
+Version: 1.1b3
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -8,7 +8,7 @@ Keywords: netbox,netbox-plugin,dns
 Author: Peter Eckel
 Author-email: pete@netbox-dns.org
 Requires-Python: >=3.10,<4.0
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/__init__.py

@@ -5,14 +5,14 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0-beta1"
+__version__ = "1.1b3"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
-    min_version = "4.1.0-beta1"
+    min_version = "4.0.0"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"
@@ -31,6 +31,7 @@ class DNSConfig(PluginConfig):
             IPAddressStatusChoices.STATUS_DHCP,
             IPAddressStatusChoices.STATUS_SLAAC,
         ],
+        "autodns_conflict_deactivate": False,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
         "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/forms/view.py

@@ -21,12 +21,14 @@ from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 from ipam.models import Prefix
+from netbox.context import current_request
 
 from netbox_dns.models import View
 from netbox_dns.fields import PrefixDynamicModelMultipleChoiceField
 from netbox_dns.utilities import (
-    get_ip_addresses_by_prefix,
+    check_dns_records,
     update_dns_records,
+    get_ip_addresses_by_prefix,
     get_views_by_prefix,
 )
 
@@ -36,6 +38,7 @@ __all__ = (
     "ViewFilterForm",
     "ViewImportForm",
     "ViewBulkEditForm",
+    "ViewPrefixEditForm",
 )
 
 
@@ -52,7 +55,7 @@ class ViewPrefixUpdateMixin:
         for prefix in prefixes.difference(old_prefixes):
             for ip_address in get_ip_addresses_by_prefix(prefix, check_view=False):
                 try:
-                    update_dns_records(ip_address, commit=False, view=self.instance)
+                    check_dns_records(ip_address, view=self.instance)
                 except ValidationError as exc:
                     self.add_error("prefixes", exc.messages)
 
@@ -74,7 +77,7 @@ class ViewPrefixUpdateMixin:
             # parent. If that's the case, the IP addresses need to be checked.
             # -
             if (parent := check_prefix.get_parents().last()) is None:
-                return
+                continue
 
             for view in get_views_by_prefix(parent):
                 if view == self.instance:
@@ -84,7 +87,7 @@ class ViewPrefixUpdateMixin:
                     check_prefix, check_view=False
                 ):
                     try:
-                        update_dns_records(ip_address, commit=False, view=view)
+                        check_dns_records(ip_address, view=view)
                     except ValidationError as exc:
                         self.add_error("prefixes", exc.messages)
 
@@ -96,6 +99,21 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
         if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
             del self.fields["prefixes"]
 
+        if request := current_request.get():
+            if not request.user.has_perm("ipam.view_prefix"):
+                self._saved_prefixes = self.initial["prefixes"]
+                self.initial["prefixes"] = []
+                self.fields["prefixes"].disabled = True
+                self.fields["prefixes"].widget.attrs[
+                    "placeholder"
+                ] = "You do not have permission to modify assigned prefixes"
+
+    def clean_prefixes(self):
+        if hasattr(self, "_saved_prefixes"):
+            return self._saved_prefixes
+
+        return self.cleaned_data["prefixes"]
+
     prefixes = PrefixDynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
@@ -200,3 +218,74 @@ class ViewBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     nullable_fields = ("description", "tenant")
+
+
+class ViewPrefixEditForm(forms.ModelForm):
+    views = DynamicModelMultipleChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        label="Assigned DNS Views",
+        help_text="Explicitly assigning DNS views overrides all inherited views for this prefix",
+    )
+
+    class Meta:
+        model = Prefix
+        fields = ("views",)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.initial["views"] = self.instance.netbox_dns_views.all()
+        self._permission_denied = False
+
+        if request := current_request.get():
+            if not request.user.has_perm("netbox_dns.change_view"):
+                self._permission_denied = True
+                self.initial["views"] = []
+                self.fields["views"].disabled = True
+                self.fields["views"].widget.attrs[
+                    "placeholder"
+                ] = "You do not have permission to modify assigned views"
+
+    def clean(self, *args, **kwargs):
+        if self._permission_denied:
+            return
+
+        prefix = self.instance
+
+        super().clean(*args, **kwargs)
+
+        views = self.cleaned_data.get("views")
+        old_views = prefix.netbox_dns_views.all()
+
+        check_views = View.objects.none()
+
+        if not views.exists():
+            if (parent := prefix.get_parents().last()) is not None:
+                check_views = parent.netbox_dns_views.all().difference(old_views)
+
+        else:
+            check_views = views.difference(old_views)
+
+        for view in check_views:
+            try:
+                for ip_address in get_ip_addresses_by_prefix(prefix, check_view=False):
+                    check_dns_records(ip_address, view=view)
+            except ValidationError as exc:
+                self.add_error("views", exc.messages)
+
+    def save(self, *args, **kwargs):
+        prefix = self.instance
+
+        if self._permission_denied:
+            return prefix
+
+        old_views = prefix.netbox_dns_views.all()
+        views = self.cleaned_data.get("views")
+
+        for view in views.difference(old_views):
+            view.prefixes.add(prefix)
+        for view in old_views.difference(views):
+            view.prefixes.remove(prefix)
+
+        return prefix

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/forms/zone.py

@@ -81,6 +81,14 @@ class ZoneTemplateUpdateMixin:
                 else:
                     zone_data = self.cleaned_data.copy()
 
+                    custom_fields = dict()
+                    for key, value in zone_data.copy().items():
+                        if key.startswith("cf_"):
+                            custom_fields[key[3:]] = value
+                            zone_data.pop(key)
+                    if custom_fields:
+                        zone_data["custom_field_data"] = custom_fields
+
                     zone_data.pop("template", None)
                     zone_data.pop("tenant_group", None)
                     zone_data.pop("_init_time", None)

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/management/commands/setup_autodns.py

@@ -29,8 +29,8 @@ class Command(BaseCommand):
                     CustomField.objects.get(
                         name=cf, object_types=ipaddress_object_type
                     ).delete()
-                    if options.get("verbosity") >= 2:
-                        self.stdout.write(f"Custom field '{cf}' removed")
+                    if options.get("verbosity"):
+                        self.stdout.write(f"Removed custom field '{cf}'")
                 except CustomField.DoesNotExist:
                     pass
             return
@@ -38,7 +38,7 @@ class Command(BaseCommand):
         # +
         # Remove pre-existing IPAM Coupling custom fields
         # -
-        if options.get("verbosity"):
+        if options.get("verbosity") >= 2:
             self.stdout.write(f"Trying to remove obsolete IPAM Coupling custom fields")
         for cf in (
             "ipaddress_dns_record_name",
@@ -48,12 +48,12 @@ class Command(BaseCommand):
                 CustomField.objects.get(
                     name=cf, object_types=ipaddress_object_type
                 ).delete()
-                if options.get("verbosity") >= 2:
+                if options.get("verbosity"):
                     self.stdout.write(f"Removed custom field '{cf}'")
             except CustomField.DoesNotExist:
                 pass
 
-        if options.get("verbosity"):
+        if options.get("verbosity") >= 2:
             self.stdout.write(f"Creating IPAM AutoDNS custom fields")
 
         if not CustomField.objects.filter(
@@ -61,7 +61,7 @@ class Command(BaseCommand):
             type=CustomFieldTypeChoices.TYPE_BOOLEAN,
             object_types=ipaddress_object_type,
         ).exists():
-            cf_disable_ptr = CustomField.objects.create(
+            cf_autodns_disabled = CustomField.objects.create(
                 name="ipaddress_dns_disabled",
                 label="Disable AutoDNS",
                 description="Disable DNS address and pointer record generation for this address",
@@ -72,15 +72,23 @@ class Command(BaseCommand):
                 is_cloneable=True,
                 weight=100,
             )
-            cf_disable_ptr.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            cf_autodns_disabled.object_types.set([ipaddress_object_type])
+            if options.get("verbosity"):
                 self.stdout.write("Created custom field 'ipaddress_dns_disabled'")
 
-        if not CustomField.objects.filter(
-            name="ipaddress_dns_record_ttl",
-            type=CustomFieldTypeChoices.TYPE_INTEGER,
-            object_types=ipaddress_object_type,
-        ).exists():
+        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 != "AutoDNS":
+                cf_ttl.group_name = "AutoDNS"
+                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:
             cf_ttl = CustomField.objects.create(
                 name="ipaddress_dns_record_ttl",
                 description="TTL for DNS records created for this address",
@@ -94,14 +102,26 @@ class Command(BaseCommand):
                 weight=200,
             )
             cf_ttl.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            if options.get("verbosity"):
                 self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
-        if not CustomField.objects.filter(
-            name="ipaddress_dns_record_disable_ptr",
-            type=CustomFieldTypeChoices.TYPE_BOOLEAN,
-            object_types=ipaddress_object_type,
-        ).exists():
+        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 != "AutoDNS":
+                cf_disable_ptr.group_name = "AutoDNS"
+                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:
             cf_disable_ptr = CustomField.objects.create(
                 name="ipaddress_dns_record_disable_ptr",
                 description="Disable DNS PTR record generation for this address",
@@ -114,7 +134,7 @@ class Command(BaseCommand):
                 weight=300,
             )
             cf_disable_ptr.object_types.set([ipaddress_object_type])
-            if options.get("verbosity") >= 2:
+            if options.get("verbosity"):
                 self.stdout.write(
                     "Created custom field 'ipaddress_dns_record_disable_ptr'"
                 )

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/models/record.py

@@ -461,8 +461,11 @@ class Record(ObjectModificationMixin, 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):
-        data = record_data_from_ip_address(ip_address, self.zone)
+    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)
 
         if data is None:
             self.delete()
@@ -490,9 +493,12 @@ class Record(ObjectModificationMixin, NetBoxModel):
             **data,
         )
 
-    def validate_name(self):
+    def validate_name(self, new_zone=None):
+        if new_zone is None:
+            new_zone = self.zone
+
         try:
-            _zone = dns_name.from_text(self.zone.name, origin=dns_name.root)
+            _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)
 
@@ -512,7 +518,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if not fqdn.is_subdomain(_zone):
             raise ValidationError(
                 {
-                    "name": f"{self.name} is not a name in {self.zone.name}",
+                    "name": f"{self.name} is not a name in {new_zone.name}",
                 }
             )
 
@@ -544,15 +550,18 @@ class Record(ObjectModificationMixin, NetBoxModel):
         except ValidationError as exc:
             raise ValidationError({"value": exc}) from None
 
-    def check_unique_record(self):
+    def check_unique_record(self, new_zone=None):
         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=self.zone,
+            zone=new_zone,
             name=self.name,
             type=self.type,
             value=self.value,
@@ -562,13 +571,41 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if self.pk is not None:
             records = records.exclude(pk=self.pk)
 
-        if len(records):
+        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", "autodns_conflict_deactivate", False
+                ):
+                    return
+
             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", "autodns_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
@@ -587,8 +624,12 @@ class Record(ObjectModificationMixin, 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
 
@@ -621,6 +662,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
             .exclude(pk=self.pk)
             .exclude(ttl=ttl)
             .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(status=RecordStatusChoices.STATUS_INACTIVE)
         )
 
         for record in records:
@@ -631,10 +673,10 @@ class Record(ObjectModificationMixin, NetBoxModel):
         self.type = self.type.upper()
         super().clean_fields(*args, **kwargs)
 
-    def clean(self, *args, **kwargs):
-        self.validate_name()
+    def clean(self, *args, new_zone=None, **kwargs):
+        self.validate_name(new_zone=new_zone)
         self.validate_value()
-        self.check_unique_record()
+        self.check_unique_record(new_zone=new_zone)
         if self.pk is None:
             self.check_unique_rrset_ttl()
 
@@ -740,6 +782,7 @@ class Record(ObjectModificationMixin, 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_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/models/zone.py

@@ -28,6 +28,7 @@ from netbox_dns.choices import RecordClassChoices, RecordTypeChoices, ZoneStatus
 from netbox_dns.fields import NetworkField, RFC2317NetworkField
 from netbox_dns.utilities import (
     update_dns_records,
+    check_dns_records,
     get_ip_addresses_by_zone,
     arpa_to_prefix,
     name_to_unicode,
@@ -652,6 +653,24 @@ 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)
+
+                ip_addresses = IPAddress.objects.filter(
+                    netbox_dns_records__in=self.record_set.filter(
+                        ipam_ip_address__isnull=False
+                    )
+                )
+                for ip_address in ip_addresses:
+                    try:
+                        check_dns_records(ip_address, zone=self)
+                    except ValidationError as exc:
+                        raise ValidationError(exc.messages)
+
         if self.is_reverse_zone:
             self.arpa_network = self.network_from_name
 

{netbox_plugin_dns-1.1.0b1 → netbox_plugin_dns-1.1b3}/netbox_dns/signals/ipam_autodns.py

@@ -1,5 +1,6 @@
 from netaddr import IPNetwork
 
+from django.conf import settings
 from django.dispatch import receiver
 from django.db.models.signals import pre_delete, pre_save, post_save, m2m_changed
 from django.core.exceptions import ValidationError
@@ -11,6 +12,8 @@ from utilities.exceptions import AbortRequest
 
 from netbox_dns.models import view as _view
 from netbox_dns.utilities import (
+    check_dns_records,
+    check_record_permission,
     update_dns_records,
     delete_dns_records,
     get_views_by_prefix,
@@ -18,22 +21,89 @@ from netbox_dns.utilities import (
     get_ip_addresses_by_view,
 )
 
+AUTODNS_CUSTOM_FIELDS = {
+    "ipaddress_dns_disabled": False,
+    "ipaddress_dns_record_ttl": None,
+    "ipaddress_dns_record_disable_ptr": False,
+}
+
+IPADDRESS_ACTIVE_STATUS = settings.PLUGINS_CONFIG["netbox_dns"][
+    "autodns_ipaddress_active_status"
+]
+ENFORCE_UNIQUE_RECORDS = settings.PLUGINS_CONFIG["netbox_dns"]["enforce_unique_records"]
+
 
 @receiver(post_clean, sender=IPAddress)
 def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
     if not isinstance(instance.address, IPNetwork):
         return
 
+    if instance.custom_field_data.get("ipaddress_dns_disabled"):
+        return
+
+    # +
+    # Check for uniqueness of IP address and dns_name. If unique records are
+    # enforced, report an error when trying to create the same IP address with
+    # the same dns_name. Ignore existing IP addresses that have their CF
+    # "ipaddress_dns_disabled" set to "True".
+    # -
+    duplicate_addresses = IPAddress.objects.filter(
+        address=instance.address,
+        vrf=instance.vrf,
+        dns_name=instance.dns_name,
+        status__in=IPADDRESS_ACTIVE_STATUS,
+    )
+    if instance.pk is not None:
+        duplicate_addresses = duplicate_addresses.exclude(pk=instance.pk)
+
+    if ENFORCE_UNIQUE_RECORDS and instance.status in IPADDRESS_ACTIVE_STATUS:
+        for ip_address in duplicate_addresses.only("custom_field_data"):
+            if not ip_address.custom_field_data.get("ipaddress_dns_disabled"):
+                raise ValidationError(
+                    {
+                        "dns_name": "Unique DNS records are enforced and there is already "
+                        f"an active IP address {instance.address} with DNS name {instance.dns_name}. "
+                        "Plesase choose a different name or disable record creation for this "
+                        "IP address."
+                    }
+                )
+
+    # +
+    # Check NetBox DNS record permission for changes to IPAddress custom fields
+    #
+    # Normally, as the modfication of DNS fields
+    if (request := current_request.get()) is not None:
+        cf_data = instance.custom_field_data
+        if (
+            instance.pk is not None
+            and any(
+                (
+                    cf_data.get(cf, cf_default)
+                    != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(
+                        cf, cf_default
+                    )
+                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                )
+            )
+            and not check_record_permission()
+        ) or (
+            instance.pk is None
+            and any(
+                (
+                    cf_data.get(cf, cf_default) != cf_default
+                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                )
+            )
+            and not check_record_permission(change=False, delete=False)
+        ):
+            raise ValidationError(
+                f"User '{request.user}' is not allowed to alter AutoDNS custom fields"
+            )
+
     try:
-        update_dns_records(instance, commit=False)
+        check_dns_records(instance)
     except ValidationError as exc:
-        if hasattr(exc, "error_dict"):
-            for field in ("name", "ttl", "value", "type"):
-                value = exc.error_dict.pop(field, None)
-                if value is not None:
-                    raise ValidationError({"dns_name": value})
-
-        raise exc
+        raise ValidationError({"dns_name": exc.messages})
 
 
 @receiver(pre_delete, sender=IPAddress)
@@ -42,8 +112,8 @@ def ipam_autodns_ipaddress_pre_delete(instance, **kwargs):
 
 
 @receiver(pre_save, sender=IPAddress)
-def ipam_autodns_ipaddress_post_save(instance, **kwargs):
-    update_dns_records(instance, commit=False)
+def ipam_autodns_ipaddress_pre_save(instance, **kwargs):
+    check_dns_records(instance)
 
 
 @receiver(post_save, sender=IPAddress)
@@ -55,16 +125,29 @@ def ipam_autodns_ipaddress_post_save(instance, **kwargs):
 def ipam_autodns_prefix_pre_save(instance, **kwargs):
     """
     Changes that modify the prefix hierarchy cannot be validated properly before
-    commiting them. So the solution in this case is to remove a prefix whose
-    VRF or network has changed from all views it currently is assigned to.
+    commiting them. So the solution in this case is to ask the user to deassign
+    the prefix from any views it is assigned to and retry.
     """
+    request = current_request.get()
+
     if instance.pk is None or not instance.netbox_dns_views.exists():
         return
 
-    saved_prefix = Prefix.objects.get(pk=instance.pk)
+    saved_prefix = Prefix.objects.prefetch_related("netbox_dns_views").get(
+        pk=instance.pk
+    )
     if saved_prefix.prefix != instance.prefix or saved_prefix.vrf != instance.vrf:
-        for view in saved_prefix.netbox_dns_views.all():
-            view.prefixes.remove(saved_prefix)
+        dns_views = ", ".join([view.name for view in instance.netbox_dns_views.all()])
+        if request is not None:
+            raise AbortRequest(
+                f"This prefix is currently assigned to the following DNS views: {dns_views}"
+                f"Please deassign it from these views before making changes to the prefix "
+                f"or VRF."
+            )
+
+        raise ValidationError(
+            f"Prefix is assigned to DNS views {dns_views}. Prefix and VRF must not be changed"
+        )
 
 
 @receiver(pre_delete, sender=Prefix)
@@ -80,7 +163,7 @@ def ipam_autodns_prefix_pre_delete(instance, **kwargs):
                 _depth=instance.depth + 1, netbox_dns_views__isnull=True
             ):
                 for ip_address in get_ip_addresses_by_prefix(prefix):
-                    update_dns_records(ip_address, commit=False)
+                    check_dns_records(ip_address)
         except ValidationError as exc:
             if request is not None:
                 raise AbortRequest(