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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b4
+Version: 1.1.0b6
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -48,6 +48,7 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 * Templating for zones and records enables faster creations of zones with given boilerplate object relations, such as name servers, tags, tenants or registration information, or records like standard SPF or MX records that are the same for a subset of zones
+* IPAM DNSsync can be used to automatically create address and pointer records for IP addresses by assigning prefixes to DNS views. When an IP address has a DNS name assigned and there are zones with matching names in the DNS views linked to the IP address' prefix, a matching DNS record will be created in these zones
 
 Other main features include:
 

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b6}/README.md

@@ -28,6 +28,7 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 * Templating for zones and records enables faster creations of zones with given boilerplate object relations, such as name servers, tags, tenants or registration information, or records like standard SPF or MX records that are the same for a subset of zones
+* IPAM DNSsync can be used to automatically create address and pointer records for IP addresses by assigning prefixes to DNS views. When an IP address has a DNS name assigned and there are zones with matching names in the DNS views linked to the IP address' prefix, a matching DNS record will be created in these zones
 
 Other main features include:
 

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

@@ -5,7 +5,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0b4"
+__version__ = "1.1.0b6"
 
 
 class DNSConfig(PluginConfig):
@@ -32,6 +32,7 @@ class DNSConfig(PluginConfig):
             IPAddressStatusChoices.STATUS_SLAAC,
         ],
         "dnssync_conflict_deactivate": False,
+        "dnssync_minimum_zone_labels": 2,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
         "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b6}/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.1.0b4 → netbox_plugin_dns-1.1.0b6}/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.1.0b4 → netbox_plugin_dns-1.1.0b6}/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.1.0b4 → netbox_plugin_dns-1.1.0b6}/netbox_dns/utilities/ipam_dnssync.py

@@ -44,7 +44,7 @@ def _get_assigned_views(ip_address):
 
 def _get_record_status(ip_address):
     return (
-        RecordStatusChoices.STATE_ACTIVE
+        RecordStatusChoices.STATUS_ACTIVE
         if ip_address.status
         in settings.PLUGINS_CONFIG["netbox_dns"].get(
             "dnssync_ipaddress_active_status", []
@@ -68,9 +68,13 @@ def get_zones(ip_address, view=None, old_zone=None):
     else:
         views = [view]
 
+    min_labels = settings.PLUGINS_CONFIG["netbox_dns"].get(
+        "dnssync_minimum_zone_labels", 2
+    )
     fqdn = dns_name.from_text(ip_address.dns_name)
     zone_name_candidates = [
-        fqdn.split(i)[1].to_text().rstrip(".") for i in range(3, len(fqdn.labels))
+        fqdn.split(i)[1].to_text().rstrip(".")
+        for i in range(min_labels + 1, len(fqdn.labels))
     ]
 
     zones = _zone.Zone.objects.filter(
@@ -159,10 +163,17 @@ def update_dns_records(ip_address):
                 record.delete()
                 continue
 
+            cf_disable_ptr = ip_address.custom_field_data.get(
+                "ipaddress_dns_record_disable_ptr"
+            )
+
             if (
-                record.fqdn != ip_address.dns_name
-                or record.value != ip_address.address.ip
+                record.fqdn.rstrip(".") != ip_address.dns_name.rstrip(".")
+                or record.value != str(ip_address.address.ip)
                 or record.status != _get_record_status(ip_address)
+                or record.ttl
+                != ip_address.custom_field_data.get("ipaddress_dns_record_ttl")
+                or (cf_disable_ptr is not None and record.disable_ptr != cf_disable_ptr)
             ):
                 record.update_from_ip_address(ip_address)
 
@@ -217,7 +228,9 @@ def get_ip_addresses_by_prefix(prefix, check_view=True):
         vrf=prefix.vrf, address__net_host_contained=prefix.prefix
     )
 
-    for exclude_child in prefix.get_children().filter(netbox_dns_views__isnull=False):
+    for exclude_child in (
+        prefix.get_children().filter(netbox_dns_views__isnull=False).distinct()
+    ):
         queryset = queryset.exclude(
             vrf=exclude_child.vrf,
             address__net_host_contained=exclude_child.prefix,

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b6}/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

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.1.0b4"
+version = "1.1.0b6"
 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"