netbox-plugin-dns 1.1.0b2__py3-none-any.whl → 1.1.0b4__py3-none-any.whl

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_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_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_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_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_dns/management/commands/{setup_autodns.py → 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_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_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_dns/signals/{ipam_autodns.py → 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_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)

netbox_dns/template_content.py

@@ -1,9 +1,10 @@
 from django.conf import settings
+from django.urls import reverse
 
 from netbox.plugins.utils import get_plugin_config
 from netbox.plugins import PluginTemplateExtension
 
-from netbox_dns.models import Record, Zone, View, NameServer
+from netbox_dns.models import Record
 from netbox_dns.choices import RecordTypeChoices
 from netbox_dns.tables import RelatedRecordTable, RelatedViewTable
 from netbox_dns.utilities import get_views_by_prefix
@@ -63,6 +64,17 @@ class RelatedDNSViews(PluginTemplateExtension):
             extra_context=context,
         )
 
+    def buttons(self):
+        return self.render(
+            "netbox_dns/view/button.html",
+            extra_context={
+                "url": reverse(
+                    "plugins:netbox_dns:prefix_views",
+                    kwargs={"pk": self.context.get("object").pk},
+                ),
+            },
+        )
+
 
 class IPRelatedDNSRecords(PluginTemplateExtension):
     model = "ipam.ipaddress"
@@ -102,7 +114,7 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
         )
 
 
-if not settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
+if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
     template_extensions = [RelatedDNSRecords, RelatedDNSViews]
 else:
     template_extensions = []

netbox_dns/templates/netbox_dns/view/button.html

@@ -0,0 +1,9 @@
+{% load perms %}
+
+{% if perms.netbox_dns.change_view %}
+<a href="{{ url }}?return_url={{ object.get_absolute_url }}">
+    <button type="submit" class="btn btn-primary" name="assign-view">
+        <i class="mdi mdi-eye-outline" aria-hidden="true"></i> DNS Views
+    </button>
+</a>
+{% endif %}

netbox_dns/templates/netbox_dns/view/prefix.html

@@ -0,0 +1,41 @@
+{% extends 'generic/_base.html' %}
+
+{% block title %}
+Configure DNS views for {{ object|meta:"verbose_name" }} {{ object }} {% if object.vrf %}[{{ object.vrf }}]{% endif %}
+{% endblock title %}
+
+{% block content %}
+    <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
+
+    <form action="" method="post" enctype="multipart/form-data" class="object-edit mt-5">
+    {% csrf_token %}
+
+    <div id="form_fields" hx-disinherit="hx-select hx-swap">
+    {% if inherited_from %}
+        <div class="card">
+            <table class="table table-hover attr-table">
+                <th>Views inherited from prefix {{ inherited_from }} {% if inherited_from.vrf %}[{{ inherited_from.vrf }}] {% endif %}</th>
+                {% for view in inherited_views %}
+                    <tr><td>{{ view|linkify }}</td><td>{{ view.description }}</td></tr>
+                {% endfor %}
+            </table>
+        </div>
+    {% endif %}
+    {% block form %}
+    {% include 'htmx/form.html' %}
+    {% endblock form %}
+    </div>
+
+    <div class="text-end my-3">
+    {% block buttons %}
+        <a href="{{ return_url }}" class="btn btn-outline-secondary">Cancel</a>
+        <button type="submit" name="_update" class="btn btn-primary">Save</button>
+    {% endblock buttons %}
+    </div>
+    </form>
+    </div>
+{% endblock content %}
+
+{% block modals %}
+{% include 'inc/htmx_modal.html' with size='lg' %}
+{% endblock %}

netbox_dns/templates/netbox_dns/view.html

@@ -35,7 +35,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/tags.html' %}
-            {% if not settings.PLUGINS_CONFIG.netbox_dns.autodns_disabled %}
+            {% if not settings.PLUGINS_CONFIG.netbox_dns.dnssync_disabled %}
             <div class="card">
                 <h5 class="card-header">
                     IPAM Prefixes

netbox_dns/urls/view.py

@@ -12,6 +12,7 @@ from netbox_dns.views import (
     ViewBulkEditView,
     ViewBulkDeleteView,
     ViewZoneListView,
+    ViewPrefixEditView,
 )
 
 view_urlpatterns = [
@@ -36,4 +37,9 @@ view_urlpatterns = [
         name="view_changelog",
         kwargs={"model": View},
     ),
+    path(
+        "prefixes/<int:pk>/assign-views/",
+        ViewPrefixEditView.as_view(),
+        name="prefix_views",
+    ),
 ]

netbox_dns/utilities/__init__.py

@@ -1,2 +1,2 @@
 from .conversions import *
-from .ipam_autodns import *
+from .ipam_dnssync import *

netbox_dns/utilities/{ipam_autodns.py → ipam_dnssync.py}

@@ -13,6 +13,7 @@ from ipam.models import IPAddress, Prefix
 from netbox_dns.models import zone as _zone
 from netbox_dns.models import record as _record
 from netbox_dns.models import view as _view
+from netbox_dns.choices import RecordStatusChoices
 
 
 __all__ = (
@@ -46,13 +47,19 @@ def _get_record_status(ip_address):
         RecordStatusChoices.STATE_ACTIVE
         if ip_address.status
         in settings.PLUGINS_CONFIG["netbox_dns"].get(
-            "autodns_ipaddress_active_status", []
+            "dnssync_ipaddress_active_status", []
         )
         else RecordStatusChoices.STATUS_INACTIVE
     )
 
 
-def get_zones(ip_address, view=None):
+def _valid_entry(ip_address, zone):
+    return zone.view in _get_assigned_views(ip_address) and dns_name.from_text(
+        ip_address.dns_name
+    ).is_subdomain(dns_name.from_text(zone.name))
+
+
+def get_zones(ip_address, view=None, old_zone=None):
     if view is None:
         views = _get_assigned_views(ip_address)
         if not views:
@@ -72,10 +79,13 @@ def get_zones(ip_address, view=None):
         active=True,
     )
 
-    if not zones:
-        return []
-
     zone_map = defaultdict(list)
+
+    if old_zone is not None:
+        zones = zones.exclude(pk=old_zone.pk)
+        if _valid_entry(ip_address, old_zone):
+            zone_map[old_zone.view].append(old_zone)
+
     for zone in zones:
         zone_map[zone.view].append(zone)
 
@@ -91,35 +101,49 @@ def check_dns_records(ip_address, zone=None, view=None):
 
     if zone is None:
         zones = get_zones(ip_address, view=view)
-    else:
-        zones = [zone]
-
-    if ip_address.pk is not None:
-        for record in ip_address.netbox_dns_records.filter(zone__in=zones):
-            if (
-                record.fqdn != ip_address.dns_name
-                or record.value != ip_address.address.ip
-                or record.status != _get_record_status(ip_address)
-            ):
-                record.update_from_ip_address(ip_address)
 
-                if record is not None:
-                    record.clean()
+        if ip_address.pk is not None:
+            for record in ip_address.netbox_dns_records.filter(zone__in=zones):
+                if (
+                    record.fqdn != ip_address.dns_name
+                    or record.value != ip_address.address.ip
+                    or record.status != _get_record_status(ip_address)
+                ):
+                    record.update_from_ip_address(ip_address)
+
+                    if record is not None:
+                        record.clean()
+
+            zones = _zone.Zone.objects.filter(
+                pk__in=[zone.pk for zone in zones]
+            ).exclude(
+                pk__in=set(
+                    ip_address.netbox_dns_records.all().values_list("zone", flat=True)
+                )
+            )
 
-        zones = _zone.Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
-            pk__in=set(
-                ip_address.netbox_dns_records.all().values_list("zone", flat=True)
+        for zone in zones:
+            record = _record.Record.create_from_ip_address(
+                ip_address,
+                zone,
             )
-        )
 
-    for zone in zones:
-        record = _record.Record.create_from_ip_address(
-            ip_address,
-            zone,
-        )
+            if record is not None:
+                record.clean()
+
+    if ip_address.pk is None:
+        return
+
+    try:
+        new_zone = get_zones(ip_address, old_zone=zone)[0]
+    except IndexError:
+        return
+
+    for record in ip_address.netbox_dns_records.filter(zone=zone):
+        record.update_from_ip_address(ip_address, new_zone)
 
         if record is not None:
-            record.clean()
+            record.clean(new_zone=new_zone)
 
 
 def update_dns_records(ip_address):
@@ -240,7 +264,7 @@ def get_ip_addresses_by_zone(zone):
 
 
 def check_record_permission(add=True, change=True, delete=True):
-    checks = locals()
+    checks = locals().copy()
 
     request = current_request.get()
 
@@ -249,8 +273,8 @@ def check_record_permission(add=True, change=True, delete=True):
 
     return all(
         (
-            request.user.has_perm(f"nebox_dns.{perm}_record")
-            for perm, check in locals().items()
+            request.user.has_perm(f"netbox_dns.{perm}_record")
+            for perm, check in checks.items()
             if check
         )
     )

netbox_dns/views/record.py

@@ -90,11 +90,11 @@ class RecordView(generic.ObjectView):
                 zone=parent_zone,
             )
             cname_records = cname_records.union(
-                set(
+                {
                     record
                     for record in parent_cname_records
                     if record.value_fqdn == instance.fqdn
-                )
+                }
             )
 
         if cname_records:

netbox_dns/views/view.py

@@ -1,11 +1,19 @@
 from utilities.views import ViewTab, register_model_view
 
 from netbox.views import generic
+from ipam.models import Prefix
 
 from netbox_dns.models import View, Zone
 from netbox_dns.filtersets import ViewFilterSet, ZoneFilterSet
-from netbox_dns.forms import ViewForm, ViewFilterForm, ViewImportForm, ViewBulkEditForm
+from netbox_dns.forms import (
+    ViewForm,
+    ViewFilterForm,
+    ViewImportForm,
+    ViewBulkEditForm,
+    ViewPrefixEditForm,
+)
 from netbox_dns.tables import ViewTable, ZoneTable
+from netbox_dns.utilities import get_views_by_prefix
 
 
 __all__ = (
@@ -17,6 +25,7 @@ __all__ = (
     "ViewBulkEditView",
     "ViewBulkDeleteView",
     "ViewZoneListView",
+    "ViewPrefixEditView",
 )
 
 
@@ -61,6 +70,22 @@ class ViewBulkDeleteView(generic.BulkDeleteView):
     table = ViewTable
 
 
+class ViewPrefixEditView(generic.ObjectEditView):
+    queryset = Prefix.objects.all()
+    form = ViewPrefixEditForm
+    template_name = "netbox_dns/view/prefix.html"
+
+    def get_extra_context(self, request, instance):
+        parents = instance.get_parents()
+        if parents:
+            return {
+                "inherited_views": get_views_by_prefix(parents.last()),
+                "inherited_from": parents.filter(netbox_dns_views__isnull=False).last(),
+            }
+
+        return {}
+
+
 @register_model_view(View, "zones")
 class ViewZoneListView(generic.ObjectChildrenView):
     queryset = View.objects.all().prefetch_related("zone_set")

{netbox_plugin_dns-1.1.0b2.dist-info → netbox_plugin_dns-1.1.0b4.dist-info}/METADATA

@@ -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.dist-info → netbox_plugin_dns-1.1.0b4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=Jdvrhj7X8a6ZTLJf0EYzWJyhawP_uJc3GSdg5USr3nw,1835
+netbox_dns/__init__.py,sha256=o6LleCsdMgaES4LaRbzvKSTH7jBS01AoIZNiKwxv97Y,1880
 netbox_dns/api/nested_serializers.py,sha256=-ZhAiyf-8UHlkcBomBp1J7ci1dSwrxWRbbfskD-D_yQ,3172
 netbox_dns/api/serializers.py,sha256=u-kQurUftGkUGAMh-VkMgXPebLYeZq9WDz9uKzkk2No,370
 netbox_dns/api/serializers_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ netbox_dns/fields/rfc2317.py,sha256=24qNNLbI-SGlsKqGaLNaVk8EHFrju65YTET3O-8XgTc,
 netbox_dns/filtersets/__init__.py,sha256=zvHYWy23FFmK4vxLpoMo-OD5OQBtcTUV_HG-5LCtvQE,197
 netbox_dns/filtersets/contact.py,sha256=VnlNX6dyUlEbj7tz9cgRKSWQOdg7OqP32cD2IyD5hu8,1091
 netbox_dns/filtersets/nameserver.py,sha256=I7RoIUcgXyIoMrhuS0dJr8uPi0AdNj6D3G6t2oSiQ7s,1147
-netbox_dns/filtersets/record.py,sha256=nr-oLCnaceiQua5tL-_teYj54X-VMXQeYihbCjykaJY,3750
+netbox_dns/filtersets/record.py,sha256=Jt3RlI4MIfeY5xYkLse1y1rzmKCdmuk-CRAxxaNVYbY,3750
 netbox_dns/filtersets/record_template.py,sha256=jGSjGFEnNSoxtUd7diV8wEhw8qZclz2dKLSqyVC7Djo,1548
 netbox_dns/filtersets/registrar.py,sha256=Wh_l-IXRHnJhW7Pyokp3czQZISDKzXnWeSQKp512Drc,977
 netbox_dns/filtersets/view.py,sha256=sGUhmyr66GY2CVXOFX2g5evDt0nbU6XPPCwptvnicHQ,993
@@ -37,16 +37,16 @@ netbox_dns/forms/nameserver.py,sha256=LHomCHmFcASobaD3Z7yhAyA24h-LrYImVMz-EUXbwK
 netbox_dns/forms/record.py,sha256=svBVAFy-egDEPLcRWkxNi_1bkabKmWgJ87pmdNt6dh4,7155
 netbox_dns/forms/record_template.py,sha256=Q77p9sExJ8Xbl-Co2Px2R0At5O3naQJwx4pnino6i2o,5573
 netbox_dns/forms/registrar.py,sha256=FMnvrcq62R3wNp_2ZUEk3v_PIav0KrWPATaJ7_9KFAo,3758
-netbox_dns/forms/view.py,sha256=CSMpWmjKQdfBMILdLLyOjY6o27W3mZgAVIBGjCiPS78,6144
-netbox_dns/forms/zone.py,sha256=ZbsYcWX-t1luqBsLj4vec0IZG0lmCwGW5nzVh77qJrw,23164
+netbox_dns/forms/view.py,sha256=DkfZOLkCClTF-7pLMiZE8J1Z9_oxmeBiEWZ7-_yTZro,9045
+netbox_dns/forms/zone.py,sha256=-ww_4nepCwVnsCsJdowtzz2HPmKLqNVedHUi5QC8uoM,23445
 netbox_dns/forms/zone_template.py,sha256=UNykid5pRB_ydy40j2DzRlBXp3_QAOqdqxdUojKYTd4,8161
 netbox_dns/graphql/__init__.py,sha256=ZZSsx-VM108tB_FrcVy3uGGhtmePpkXnY5U1ytnoTvE,490
 netbox_dns/graphql/filters.py,sha256=6Ot_d1e7h5lVXVVBB3hyWUql94K3zsK9Tjb3RVJqluw,1706
 netbox_dns/graphql/schema.py,sha256=P-oQ8ei3sC6XLhgCa_riRbRTrMkPCVTJXkGv0U2rPYw,2682
-netbox_dns/graphql/types.py,sha256=4ewWOqEbWtCBiU9bdIm_6CIm6MKAM6szCAXSvokpqWg,6108
+netbox_dns/graphql/types.py,sha256=Obr9JDsMJlMaJLKbTau7prZUYI6pQj6aIpT-nT4JnZs,6210
 netbox_dns/management/commands/cleanup_database.py,sha256=kfnyybudwKGigjJmrOwafPWSUasZr9jQsxN4eWAgMvY,5969
 netbox_dns/management/commands/cleanup_rrset_ttl.py,sha256=UFRURLBcFeGHUS2lrYFv7UWIebjI72aG1EUQJt0XsXw,2046
-netbox_dns/management/commands/setup_autodns.py,sha256=kX1T7VjMZ0BPuT_zte6VO6xqOSpYJXaYNfu5dxlrZLc,5507
+netbox_dns/management/commands/setup_dnssync.py,sha256=qtVj6egSjclaQbuI60hLfl-zg89VJVbX-TB17f1k77Y,5730
 netbox_dns/management/commands/update_soa.py,sha256=Rj_Xk-qpwkAVRubVnM5OqSTwgzi93E0PqjwGb3rYjf0,660
 netbox_dns/migrations/0001_squashed_netbox_dns_0_15.py,sha256=3U0810NWSHPu2dTSHpfzlleDgwMS04FhJ_CkO76SDaw,10283
 netbox_dns/migrations/0001_squashed_netbox_dns_0_22.py,sha256=ML6Hp17lrXiaG0eUlBjKMm6HUNhw0AHPnKrb9AN-F6E,20279
@@ -72,17 +72,18 @@ netbox_dns/mixins/object_modification.py,sha256=JbGi8a52wkZ3fFBlfat590CfqRJcEWxB
 netbox_dns/models/__init__.py,sha256=wjwNsRttUVYQHZODZi806a_iUDoq_o7mdKObqh1N7N4,300
 netbox_dns/models/contact.py,sha256=oNLyD_6TOTNQQTcCvv6TAC7OkzPTMIRy2NP5nwNKaNg,3009
 netbox_dns/models/nameserver.py,sha256=yKo4Fwqnv5VtTndU2px7tRS3voF3Cal7OWQ6AImLwl0,3208
-netbox_dns/models/record.py,sha256=99Ys3daxvTJuUP6NeTJrEx8Du5C8c70zk8R7S_8YWAs,25703
+netbox_dns/models/record.py,sha256=LgJJvL85hKrN9a3fpq90k9oit8oqNvzwbrA-MVve8DE,25963
 netbox_dns/models/record_template.py,sha256=3t9VceviX3kNIo5o0VPVFupLFDqPxpHIVLp5U3pBKB4,4661
 netbox_dns/models/registrar.py,sha256=T_oMUlTWTDixOVlIbEZGvOBdvUrKxRkkS41xgM2Oee8,1557
 netbox_dns/models/view.py,sha256=SYmhNYyRCv0rSCK5jrHtug4QgfWCBbjsAjZEEHk02QU,2873
-netbox_dns/models/zone.py,sha256=clKeoQ7ECYMKwIbqXnszOkuCRGC1_Q6N3q5xTUg8yoY,28905
+netbox_dns/models/zone.py,sha256=C1f6uGKGeD_FKtFhWXiUO7gKF19pzu-9-pj0txP8R1E,29063
 netbox_dns/models/zone_template.py,sha256=lkiSIfx8KM0Cs3Mb3dLBxKbSpcssVUzQiSmD5W46was,3753
 netbox_dns/navigation.py,sha256=EITDZkbpu4KCC9u4Noj7OORWnkL3EYT2RIRvYlTw34Q,5961
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-netbox_dns/signals/ipam_autodns.py,sha256=HJkDU7BZHGFb02YlZHtCTRyKQiR3ZxSwempo-NdQ3o4,5779
+netbox_dns/signals/ipam_dnssync.py,sha256=uGK8R_pEKZJ4STTYgw2y5j0g6T0pQZbI9HZLmtfdOwM,7878
 netbox_dns/tables/__init__.py,sha256=s41w4o77tIwmhnLjsOsg08R9m3wrlomkkfCLTVQuPzc,196
 netbox_dns/tables/contact.py,sha256=sPs7d1ZhVC5dOS37dPYFqebNd7WGvsV_eYzX_TMcbzY,804
+netbox_dns/tables/ipam_dnssync.py,sha256=7gxf6nXn2zgpnpCr5E5qebXv7QCzrgIqfSzyka53USU,272
 netbox_dns/tables/nameserver.py,sha256=fFiE-yH-_GyRDaV4SVw094r6uH58Kx56NSWDGaMR58g,764
 netbox_dns/tables/record.py,sha256=0Yg0qwZ8Vjz6pkZnmof4ZK1Hsvk9DNEzmJwoIwJZJFQ,3189
 netbox_dns/tables/record_template.py,sha256=16Lu-WDjs2m9Uxx6WkURL39NlyJ8lWzj5Kl6C6lz3E8,2159
@@ -90,7 +91,7 @@ netbox_dns/tables/registrar.py,sha256=M-ckyQUs6dqjTCPf7bAr6UuLEA-q9f9CxKW7yp3rGo
 netbox_dns/tables/view.py,sha256=jf2S4TiOdMq6-wWk0ndR1uBJpkOx_f3pqAuM1nSXTBo,1178
 netbox_dns/tables/zone.py,sha256=IeCiflrQBn1INV_PxoTySWQrDalykY4mDSG76VXC5WM,1877
 netbox_dns/tables/zone_template.py,sha256=70hvS-xpeaLkcM6y0R9xsUMQVKgTgZJaWWNd99BfmzI,1479
-netbox_dns/template_content.py,sha256=Lhrse5_Aw6L5xaemTD8-ZlTyFqJ-fVqp97TSRT6E7ek,3390
+netbox_dns/template_content.py,sha256=YzE-ZJlERhFybrUKJrmNwHk8_8RPNexkV66x62Sbzic,3718
 netbox_dns/templates/netbox_dns/contact.html,sha256=fMHAQyLXIxohKoCTxFEnKetl9UVXeQgjasfpv_JONaw,2855
 netbox_dns/templates/netbox_dns/nameserver.html,sha256=DpTdetQVV_jKThDbi62LvbhiCay-1QxR-yiJEiPFm4w,1554
 netbox_dns/templates/netbox_dns/record/managed.html,sha256=G6LPG1koUGuzUiwYdv1okdVa4sKaofiQegDBnsFL0kA,89
@@ -98,8 +99,10 @@ netbox_dns/templates/netbox_dns/record/related.html,sha256=Aqor8uGcuHQTHjlX-Xmni
 netbox_dns/templates/netbox_dns/record.html,sha256=o3z_D6Fqqn7nx1IwPXKQ75ZaPhU6kae0WpaWa3UMcxQ,5211
 netbox_dns/templates/netbox_dns/recordtemplate.html,sha256=9tkXtKqa5p3LdOU9REm99WSFwGJaH8OczpIqXZuXMcg,3099
 netbox_dns/templates/netbox_dns/registrar.html,sha256=O5veGmW59Pf5yN25ihPLvRIkA2P7xmSGv0G3NrRG8vI,2152
+netbox_dns/templates/netbox_dns/view/button.html,sha256=oXKNyPtY8XIu2sxtZWpFRXKXv862407ESyUQ4YsWCGE,292
+netbox_dns/templates/netbox_dns/view/prefix.html,sha256=HD8f4mnbzFOXDj3Y_yq8yEeDpz_yFud8ZMpqbxzCEnA,1445
 netbox_dns/templates/netbox_dns/view/related.html,sha256=W9Ie2aOsFkWyYtBnZn38seQDBmyJkV9dqFDG-Dq3yMk,736
-netbox_dns/templates/netbox_dns/view.html,sha256=NSEfPSHPLw5yjUSat9N_KYKF5FezmTlCXqPC6FYiK9E,2479
+netbox_dns/templates/netbox_dns/view.html,sha256=zqf42FGdNudoIIWCaCe9bmP_VOZDbv3GjS-qJNMKPVY,2479
 netbox_dns/templates/netbox_dns/zone/base.html,sha256=n_E4aVYdGeZZl-ARE8sb4DgAAgPs92X1UEFepX3xIlM,495
 netbox_dns/templates/netbox_dns/zone/child.html,sha256=kH56PJFBGCjiRdIh7zCtClnZdfOChqN_sYslsyoz5gU,2147
 netbox_dns/templates/netbox_dns/zone/child_zone.html,sha256=b9CSGWEfWT7hLQ80gApMnu7mXM8w2LT-3UaOYe6HIRQ,510
@@ -115,12 +118,12 @@ netbox_dns/urls/nameserver.py,sha256=BBbY-wqPqCquvLLv1_JhqToj7oDHhPNGCWHt0IfjBNM
 netbox_dns/urls/record.py,sha256=bDprohTso1N0GtPXH4X3TNHnkxopiOSQFXWItifEZ_k,1432
 netbox_dns/urls/record_template.py,sha256=Z-7aA-rPIxRBCmXNUiQcHIgjYfai28Tf_sLtkl2ihDk,1827
 netbox_dns/urls/registrar.py,sha256=u6B0zGGYNUJIKTo9uGiUeZLPD0QMGaQOAPShGEy4NaA,1728
-netbox_dns/urls/view.py,sha256=8AeBnOHWusXXQs4JXpNfMSHqszXAY1GDXGWmNsMulQ8,1327
+netbox_dns/urls/view.py,sha256=jz5ANOOLCMAcWermTZYGq9BvnP02jpKGL6hCm33C47Q,1478
 netbox_dns/urls/zone.py,sha256=rmB1BkzmWNG06ILUf-39Aj6-SBFkwQouyixMQiamqPc,2005
 netbox_dns/urls/zone_template.py,sha256=w3Gu8qfLCWyHofeLkGZd1HpYSlcslomVlBQJZyqh8kk,1690
-netbox_dns/utilities/__init__.py,sha256=M9T8PUFlGddtENzEznHAPbEsz1VFrPcmbD-BGLCsvB4,55
+netbox_dns/utilities/__init__.py,sha256=mmR0JdH1DJVhUKesnO3CZFj0Rw_wrsMPoYTpOOKHl9I,55
 netbox_dns/utilities/conversions.py,sha256=NS37SoMqXc13wNWRkKnLfyQbVi6QKD33fu5ovTKRo74,1979
-netbox_dns/utilities/ipam_autodns.py,sha256=Wit1MoJbPlYIUMfft13u7LY_Lr_zOb13DGkxIS-n-98,7338
+netbox_dns/utilities/ipam_dnssync.py,sha256=LIUCigDdobPikneY-td3ydY2iK-iDDe75VGxcCBLdP8,8188
 netbox_dns/validators/__init__.py,sha256=Mr8TvmcJTa8Pubj8TzbFBKfbHhEmGcr5JdQvczEJ39A,72
 netbox_dns/validators/dns_name.py,sha256=B4A0BOW5pKDjjukvksriRtnLzkYTx_pFjh7eqKo6PBE,3069
 netbox_dns/validators/dns_value.py,sha256=y2Zga4hmywqDrTBXcMC-sWaFbw4eoY8pySq7cWnMP8Y,2822
@@ -128,13 +131,13 @@ netbox_dns/validators/rfc2317.py,sha256=ivylEiNKlmX2x41rwqDrFkD5CFf9FtpNEfsKHX_p
 netbox_dns/views/__init__.py,sha256=s41w4o77tIwmhnLjsOsg08R9m3wrlomkkfCLTVQuPzc,196
 netbox_dns/views/contact.py,sha256=qM9F6MQBvO8ERR7quGLdQ5kW4roNLJ61As8m0qQTapg,2471
 netbox_dns/views/nameserver.py,sha256=DFr0eybMshc1FW06g4cy9Nk4VRMxRqakI5KtHFiAVRc,3286
-netbox_dns/views/record.py,sha256=fHMafCC14C7d6oXbXc2vN-T70OAOaTY77_m3Dct-oiQ,4590
+netbox_dns/views/record.py,sha256=Qv-Yf9CxlHz9C9-8hy-_WVbRL5f6opXUHJD4SsDcVGo,4587
 netbox_dns/views/record_template.py,sha256=BkemTBEramLhYqB6HrA80sNgtduW1ZOJwbYs3i7srik,2510
 netbox_dns/views/registrar.py,sha256=yRQgFm3vgBD21ZQex9asjs0QWegvSHlcyHXLnjvc5xs,2324
-netbox_dns/views/view.py,sha256=I_hVZYFJF8GTnlUKPrTgBk_x9UDCbZXM8R7U5Bhizjs,2107
+netbox_dns/views/view.py,sha256=iXBJTc3JD5cD5z0RTcHVTtYV-KNIJGneeoxymXChdUE,2759
 netbox_dns/views/zone.py,sha256=SKhf_WHcFVpKqFTuUMf-Dmxu1AwFHBeo_DtD8UGFrJ8,5483
 netbox_dns/views/zone_template.py,sha256=qvXl-bpc1fMc1WFngynj4-Q3-JJDgKdT-r54s4M1D0s,2118
-netbox_plugin_dns-1.1.0b2.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
-netbox_plugin_dns-1.1.0b2.dist-info/METADATA,sha256=V0TQOjdcjkw1vAf_Ih85cV2vr0xgG_10VEJkn8a2BBw,6406
-netbox_plugin_dns-1.1.0b2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-netbox_plugin_dns-1.1.0b2.dist-info/RECORD,,
+netbox_plugin_dns-1.1.0b4.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
+netbox_plugin_dns-1.1.0b4.dist-info/METADATA,sha256=ktOXrD3WonLsUqWDbTg_n8w_ItTFfW7NB_60nuMcnwY,6406
+netbox_plugin_dns-1.1.0b4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+netbox_plugin_dns-1.1.0b4.dist-info/RECORD,,