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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1b3
+Version: 1.1.0b5
 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.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/__init__.py

@@ -5,7 +5,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1b3"
+__version__ = "1.1.0b5"
 
 
 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.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/api/views.py

@@ -4,6 +4,7 @@ from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 
 from ipam.models import Prefix
+from ipam.filtersets import PrefixFilterSet
 
 from netbox.api.viewsets import NetBoxModelViewSet
 
@@ -160,3 +161,4 @@ class RecordTemplateViewSet(NetBoxModelViewSet):
 class PrefixViewSet(NetBoxModelViewSet):
     queryset = Prefix.objects.all()
     serializer_class = PrefixSerializer
+    filterset_class = PrefixFilterSet

{netbox_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/fields/ipam.py

@@ -6,9 +6,6 @@ __all__ = ("PrefixDynamicModelMultipleChoiceField",)
 
 
 class PrefixDynamicModelMultipleChoiceField(DynamicModelMultipleChoiceField):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     widget = APISelectMultiple(api_url="/api/plugins/netbox-dns/prefixes")
 
     def label_from_instance(self, obj):

{netbox_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/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.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/forms/view.py

@@ -27,7 +27,6 @@ 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,
 )
@@ -96,7 +95,7 @@ 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():
@@ -145,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
@@ -181,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(

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

@@ -81,7 +81,7 @@ class ZoneTemplateUpdateMixin:
                 else:
                     zone_data = self.cleaned_data.copy()
 
-                    custom_fields = dict()
+                    custom_fields = {}
                     for key, value in zone_data.copy().items():
                         if key.startswith("cf_"):
                             custom_fields[key[3:]] = value
@@ -105,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.1b3 → netbox_plugin_dns-1.1.0b5}/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.1b3/netbox_dns/management/commands/setup_autodns.py → netbox_plugin_dns-1.1.0b5/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",
@@ -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,8 @@ 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"):
@@ -97,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,
             )
@@ -111,8 +111,8 @@ 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",
                 )
@@ -129,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.1b3 → netbox_plugin_dns-1.1.0b5}/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
         ),
@@ -576,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
 
@@ -590,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(
@@ -633,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})."

netbox_plugin_dns-1.1b3/netbox_dns/signals/ipam_autodns.py → netbox_plugin_dns-1.1.0b5/netbox_dns/signals/ipam_dnssync.py

@@ -18,23 +18,22 @@ 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"][
-    "autodns_ipaddress_active_status"
+    "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
 
@@ -82,7 +81,7 @@ def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
                     != IPAddress.objects.get(pk=instance.pk).custom_field_data.get(
                         cf, cf_default
                     )
-                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                    for cf, cf_default in DNSSYNC_CUSTOM_FIELDS.items()
                 )
             )
             and not check_record_permission()
@@ -91,13 +90,13 @@ def ipam_autodns_ipaddress_post_clean(instance, **kwargs):
             and any(
                 (
                     cf_data.get(cf, cf_default) != cf_default
-                    for cf, cf_default in AUTODNS_CUSTOM_FIELDS.items()
+                    for cf, cf_default in DNSSYNC_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"
+                f"User '{request.user}' is not allowed to alter DNSsync custom fields"
             )
 
     try:
@@ -107,22 +106,22 @@ 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 ask the user to deassign
@@ -151,7 +150,7 @@ def ipam_autodns_prefix_pre_save(instance, **kwargs):
 
 
 @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()
 
@@ -195,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.0b5/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_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/tables/record.py

@@ -1,4 +1,7 @@
 import django_tables2 as tables
+from django_tables2.utils import Accessor
+from django.utils.html import format_html
+
 
 from netbox.tables import (
     NetBoxTable,
@@ -6,11 +9,16 @@ from netbox.tables import (
     TagColumn,
     ActionsColumn,
 )
+from ipam.lookups import Host, Inet
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
+import logging
+
+logger = logging.getLogger("netbox_dns")
+
 
 __all__ = (
     "RecordTable",
@@ -100,6 +108,11 @@ class ManagedRecordTable(RecordBaseTable):
         verbose_name="IPAM IP Address",
         linkify=True,
     )
+    related_ip_address = tables.Column(
+        verbose_name="Related IP Address",
+        empty_values=(),
+        orderable=False,
+    )
     actions = ActionsColumn(actions=("changelog",))
 
     class Meta(NetBoxTable.Meta):
@@ -113,6 +126,7 @@ class ManagedRecordTable(RecordBaseTable):
             "unicode_value",
             "address_record",
             "ipam_ip_address",
+            "related_ip_address",
             "active",
         )
         default_columns = (
@@ -124,6 +138,28 @@ class ManagedRecordTable(RecordBaseTable):
             "active",
         )
 
+    def render_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            address = record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            address = record.address_record.ipam_ip_address
+        else:
+            return format_html("—")
+
+        return format_html(f"<a href='{address.get_absolute_url()}'>{address}</a>")
+
+    def value_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            return record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            return record.address_record.ipam_ip_address
+
 
 class RelatedRecordTable(RecordBaseTable):
     actions = ActionsColumn(actions=())

{netbox_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/template_content.py

@@ -4,7 +4,7 @@ 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
@@ -114,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_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/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_plugin_dns-1.1.0b5/netbox_dns/utilities/__init__.py

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

netbox_plugin_dns-1.1b3/netbox_dns/utilities/ipam_autodns.py → netbox_plugin_dns-1.1.0b5/netbox_dns/utilities/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,7 +47,7 @@ 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
     )

{netbox_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/netbox_dns/views/record.py

@@ -1,6 +1,10 @@
 from dns import name as dns_name
 
+from django.db.models import F, Q, Case, When, OuterRef, Subquery
+
 from netbox.views import generic
+from ipam.fields import IPAddressField
+from ipam.models import IPAddress
 
 from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
@@ -37,9 +41,7 @@ class RecordListView(generic.ObjectListView):
 
 
 class ManagedRecordListView(generic.ObjectListView):
-    queryset = Record.objects.filter(managed=True).prefetch_related(
-        "zone", "address_record"
-    )
+    queryset = Record.objects.prefetch_related("ipam_ip_address", "address_record")
     filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable
@@ -90,11 +92,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_plugin_dns-1.1b3 → netbox_plugin_dns-1.1.0b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.1b3"
+version = "1.1.0b5"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pete@netbox-dns.org>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"

netbox_plugin_dns-1.1b3/netbox_dns/utilities/__init__.py

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