netbox-plugin-dns 1.1.0b2__tar.gz → 1.1.0b4__tar.gz

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b2
+Version: 1.1.0b4
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/__init__.py

@@ -5,7 +5,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0b2"
+__version__ = "1.1.0b4"
 
 
 class DNSConfig(PluginConfig):
@@ -25,13 +25,13 @@ class DNSConfig(PluginConfig):
         "zone_soa_retry": 7200,
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
-        "autodns_disabled": False,
-        "autodns_ipaddress_active_status": [
+        "dnssync_disabled": False,
+        "dnssync_ipaddress_active_status": [
             IPAddressStatusChoices.STATUS_ACTIVE,
             IPAddressStatusChoices.STATUS_DHCP,
             IPAddressStatusChoices.STATUS_SLAAC,
         ],
-        "autodns_conflict_deactivate": False,
+        "dnssync_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
@@ -51,8 +51,9 @@ class DNSConfig(PluginConfig):
     def ready(self):
         super().ready()
 
-        if not settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
-            from netbox_dns.signals import ipam_autodns
+        if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+            import netbox_dns.signals.ipam_dnssync
+            import netbox_dns.tables.ipam_dnssync
 
 
 #

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/filtersets/record.py

@@ -121,7 +121,7 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         if not value.strip():
             return queryset
         qs_filter = (
-            Q(name__icontains=value)
+            Q(fqdn__icontains=value)
             | Q(value__icontains=value)
             | Q(zone__name__icontains=value)
         )

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/forms/view.py

@@ -21,12 +21,12 @@ 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 (
     check_dns_records,
-    update_dns_records,
     get_ip_addresses_by_prefix,
     get_views_by_prefix,
 )
@@ -37,6 +37,7 @@ __all__ = (
     "ViewFilterForm",
     "ViewImportForm",
     "ViewBulkEditForm",
+    "ViewPrefixEditForm",
 )
 
 
@@ -94,9 +95,24 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_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,
@@ -128,7 +144,7 @@ class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
             del self.fields["prefix_id"]
 
     model = View
@@ -164,7 +180,7 @@ class ViewImportForm(ViewPrefixUpdateMixin, NetBoxModelImportForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
             del self.fields["prefixes"]
 
     prefixes = CSVModelMultipleChoiceField(
@@ -201,3 +217,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.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/forms/zone.py

@@ -81,6 +81,14 @@ class ZoneTemplateUpdateMixin:
                 else:
                     zone_data = self.cleaned_data.copy()
 
+                    custom_fields = {}
+                    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)
@@ -97,10 +105,7 @@ class ZoneTemplateUpdateMixin:
                 raise RollbackTransaction
 
         except ValidationError as exc:
-            if isinstance(exc, dict):
-                template_error = item.value()
-            else:
-                template_error = [exc]
+            self.add_error("template", exc.messages)
         except RollbackTransaction:
             pass
 

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/graphql/types.py

@@ -4,6 +4,8 @@ import strawberry
 import strawberry_django
 
 from netbox.graphql.types import NetBoxObjectType
+from tenancy.graphql.types import TenantType
+from ipam.graphql.types import IPAddressType, PrefixType
 from netbox.graphql.scalars import BigInt
 
 from netbox_dns.models import (

netbox_plugin_dns-1.1.0b2/netbox_dns/management/commands/setup_autodns.py → netbox_plugin_dns-1.1.0b4/netbox_dns/management/commands/setup_dnssync.py

@@ -7,7 +7,7 @@ from ipam.models import IPAddress
 
 
 class Command(BaseCommand):
-    help = "Setup IPAddress custom fields for IPAM AutoDNS"
+    help = "Setup IPAddress custom fields for IPAM DNSsync"
 
     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(f"Trying to remove IPAM AutoDNS custom fields")
+                self.stdout.write("Trying to remove IPAM DNSsync custom fields")
             for cf in (
                 "ipaddress_dns_disabled",
                 "ipaddress_dns_record_ttl",
@@ -30,7 +30,7 @@ class Command(BaseCommand):
                         name=cf, object_types=ipaddress_object_type
                     ).delete()
                     if options.get("verbosity"):
-                        self.stdout.write(f"Custom field '{cf}' removed")
+                        self.stdout.write(f"Removed custom field '{cf}'")
                 except CustomField.DoesNotExist:
                     pass
             return
@@ -39,7 +39,7 @@ class Command(BaseCommand):
         # Remove pre-existing IPAM Coupling custom fields
         # -
         if options.get("verbosity") >= 2:
-            self.stdout.write(f"Trying to remove obsolete IPAM Coupling custom fields")
+            self.stdout.write("Trying to remove obsolete IPAM Coupling custom fields")
         for cf in (
             "ipaddress_dns_record_name",
             "ipaddress_dns_zone_id",
@@ -54,25 +54,25 @@ class Command(BaseCommand):
                 pass
 
         if options.get("verbosity") >= 2:
-            self.stdout.write(f"Creating IPAM AutoDNS custom fields")
+            self.stdout.write("Creating IPAM DNSsync custom fields")
 
         if not CustomField.objects.filter(
             name="ipaddress_dns_disabled",
             type=CustomFieldTypeChoices.TYPE_BOOLEAN,
             object_types=ipaddress_object_type,
         ).exists():
-            cf_autodns_disabled = CustomField.objects.create(
+            cf_dnssync_disabled = CustomField.objects.create(
                 name="ipaddress_dns_disabled",
-                label="Disable AutoDNS",
+                label="Disable DNSsync",
                 description="Disable DNS address and pointer record generation for this address",
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
                 required=False,
                 default=False,
-                group_name="AutoDNS",
+                group_name="DNSsync",
                 is_cloneable=True,
                 weight=100,
             )
-            cf_autodns_disabled.object_types.set([ipaddress_object_type])
+            cf_dnssync_disabled.object_types.set([ipaddress_object_type])
             if options.get("verbosity"):
                 self.stdout.write("Created custom field 'ipaddress_dns_disabled'")
 
@@ -82,8 +82,9 @@ class Command(BaseCommand):
                 type=CustomFieldTypeChoices.TYPE_INTEGER,
                 object_types=ipaddress_object_type,
             )
-            if cf_ttl.group_name != "AutoDNS":
-                cf_ttl.group_name = "AutoDNS"
+            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'")
@@ -96,7 +97,7 @@ class Command(BaseCommand):
                 validation_minimum=0,
                 validation_maximum=2147483647,
                 required=False,
-                group_name="AutoDNS",
+                group_name="DNSsync",
                 is_cloneable=True,
                 weight=200,
             )
@@ -110,8 +111,11 @@ class Command(BaseCommand):
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
                 object_types=ipaddress_object_type,
             )
-            if cf_disable_ptr.group_name != "AutoDNS":
-                cf_disable_ptr.group_name = "AutoDNS"
+            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(
@@ -125,7 +129,7 @@ class Command(BaseCommand):
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
                 required=False,
                 default=False,
-                group_name="AutoDNS",
+                group_name="DNSsync",
                 is_cloneable=True,
                 weight=300,
             )

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/models/record.py

@@ -58,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(
-                "autodns_ipaddress_active_status", []
+                "dnssync_ipaddress_active_status", []
             )
             else RecordStatusChoices.STATUS_INACTIVE
         ),
@@ -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,
@@ -567,7 +576,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
                 if not records.filter(
                     ipam_ip_address__isnull=True
                 ).exists() or get_plugin_config(
-                    "netbox_dns", "autodns_conflict_deactivate", False
+                    "netbox_dns", "dnssync_conflict_deactivate", False
                 ):
                     return
 
@@ -581,7 +590,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if self.ipam_ip_address is None or not self.is_active:
             return
 
-        if not get_plugin_config("netbox_dns", "autodns_conflict_deactivate", False):
+        if not get_plugin_config("netbox_dns", "dnssync_conflict_deactivate", False):
             return
 
         records = Record.objects.filter(
@@ -624,7 +633,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
         if not records.exists():
             return
 
-        conflicting_ttls = ", ".join(set(str(record.ttl) for record in records))
+        conflicting_ttls = ", ".join({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})."
@@ -664,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()
 

{netbox_plugin_dns-1.1.0b2 → netbox_plugin_dns-1.1.0b4}/netbox_dns/models/zone.py

@@ -654,13 +654,18 @@ class Zone(ObjectModificationMixin, NetBoxModel):
                     )
 
             if old_zone.name != self.name or old_zone.view != self.view:
-                update_ip_addresses = IPAddress.objects.filter(
-                    pk__in=self.record_set.filter(
+                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
-                    ).values_list("ipam_ip_address", flat=True)
+                    )
                 )
-                update_ip_addresses |= get_ip_addresses_by_zone(self)
-                for ip_address in update_ip_addresses:
+                for ip_address in ip_addresses:
                     try:
                         check_dns_records(ip_address, zone=self)
                     except ValidationError as exc:

netbox_plugin_dns-1.1.0b2/netbox_dns/signals/ipam_autodns.py → netbox_plugin_dns-1.1.0b4/netbox_dns/signals/ipam_dnssync.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
@@ -17,21 +18,55 @@ from netbox_dns.utilities import (
     delete_dns_records,
     get_views_by_prefix,
     get_ip_addresses_by_prefix,
-    get_ip_addresses_by_view,
 )
 
-AUTODNS_CUSTOM_FIELDS = {
+DNSSYNC_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"][
+    "dnssync_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):
+def ipam_dnssync_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
     #
@@ -42,24 +77,26 @@ def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
             instance.pk is not None
             and any(
                 (
-                    cf_data.get(cf)
-                    != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(cf)
-                    for cf in AUTODNS_CUSTOM_FIELDS.keys()
+                    cf_data.get(cf, cf_default)
+                    != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(
+                        cf, cf_default
+                    )
+                    for cf, cf_default in DNSSYNC_CUSTOM_FIELDS.items()
                 )
             )
-            and not check_record_permission(request)
+            and not check_record_permission()
         ) or (
             instance.pk is None
             and any(
                 (
-                    cf_data.get(cf) != cf_default
-                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                    cf_data.get(cf, cf_default) != cf_default
+                    for cf, cf_default in DNSSYNC_CUSTOM_FIELDS.items()
                 )
             )
-            and not check_record_permission(request, change=False, delete=False)
+            and not check_record_permission(change=False, delete=False)
         ):
             raise ValidationError(
-                f"User '{request.user}' is not allowed to alter AutoDNS custom fields"
+                f"User '{request.user}' is not allowed to alter DNSsync custom fields"
             )
 
     try:
@@ -69,38 +106,51 @@ def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
 
 
 @receiver(pre_delete, sender=IPAddress)
-def ipam_autodns_ipaddress_pre_delete(instance, **kwargs):
+def ipam_dnssync_ipaddress_pre_delete(instance, **kwargs):
     delete_dns_records(instance)
 
 
 @receiver(pre_save, sender=IPAddress)
-def ipam_autodns_ipaddress_pre_save(instance, **kwargs):
+def ipam_dnssync_ipaddress_pre_save(instance, **kwargs):
     check_dns_records(instance)
 
 
 @receiver(post_save, sender=IPAddress)
-def ipam_autodns_ipaddress_post_save(instance, **kwargs):
+def ipam_dnssync_ipaddress_post_save(instance, **kwargs):
     update_dns_records(instance)
 
 
 @receiver(pre_save, sender=Prefix)
-def ipam_autodns_prefix_pre_save(instance, **kwargs):
+def ipam_dnssync_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)
-def ipam_autodns_prefix_pre_delete(instance, **kwargs):
+def ipam_dnssync_prefix_pre_delete(instance, **kwargs):
     parent = instance.get_parents().last()
     request = current_request.get()
 
@@ -144,7 +194,7 @@ def ipam_autodns_prefix_pre_delete(instance, **kwargs):
 
 
 @receiver(m2m_changed, sender=_view.View.prefixes.through)
-def ipam_autodns_view_prefix_changed(**kwargs):
+def ipam_dnssync_view_prefix_changed(**kwargs):
     action = kwargs.get("action")
     request = current_request.get()
 

netbox_plugin_dns-1.1.0b4/netbox_dns/tables/ipam_dnssync.py

@@ -0,0 +1,11 @@
+import django_tables2 as tables
+
+from ipam.tables import PrefixTable
+from utilities.tables import register_table_column
+
+views = tables.ManyToManyColumn(
+    verbose_name="DNS Views",
+    linkify_item=True,
+)
+
+register_table_column(views, "netbox_dns_views", PrefixTable)