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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b5
+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.0b5 → 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.0b5 → 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.0b5"
+__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.0b5 → 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.0b5 → netbox_plugin_dns-1.1.0b6}/pyproject.toml

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