netbox-plugin-dns 0.21.14__tar.gz → 0.21.16__tar.gz

{netbox_plugin_dns-0.21.14 → netbox_plugin_dns-0.21.16}/PKG-INFO

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

@@ -1,6 +1,7 @@
 import sys
 
 from extras.plugins import PluginConfig
+from django.db.utils import OperationalError
 
 try:
     # NetBox 3.5.0 - 3.5.7, 3.5.9+
@@ -9,7 +10,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.21.14"
+__version__ = "0.21.16"
 
 
 class DNSConfig(PluginConfig):
@@ -50,17 +51,29 @@ class DNSConfig(PluginConfig):
             from ipam.models import IPAddress
             from django.contrib.contenttypes.models import ContentType
 
-            objtype = ContentType.objects.get_for_model(IPAddress)
-            required_cf = ("ipaddress_dns_record_name", "ipaddress_dns_zone_id")
+            try:
+                objtype = ContentType.objects.get_for_model(IPAddress)
+                required_cf = (
+                    "ipaddress_dns_record_name",
+                    "ipaddress_dns_record_ttl",
+                    "ipaddress_dns_record_disable_ptr",
+                    "ipaddress_dns_zone_id",
+                )
 
-            if CustomField.objects.filter(
-                name__in=required_cf, content_types=objtype
-            ).count() < len(required_cf):
+                if CustomField.objects.filter(
+                    name__in=required_cf, content_types=objtype
+                ).count() < len(required_cf):
+                    print(
+                        "WARNING: 'feature_ipam_coupling' is enabled, but the required"
+                        " custom fields for IPAM DNS coupling are missing. Please run"
+                        " the Django management command 'setup_coupling' to create the"
+                        " missing custom fields.",
+                        file=sys.stderr,
+                    )
+            except OperationalError as exc:
                 print(
-                    "WARNING: 'feature_ipam_coupling' is enabled, but the required"
-                    " custom fields for IPAM DNS coupling are missing. Please run"
-                    " the Django management command 'setup_coupling' to create the"
-                    " custom fields.",
+                    "WARNING: Unable to connect to PostgreSQL, cannot check custom fields"
+                    " for feature_ipam_coupling",
                     file=sys.stderr,
                 )
 

{netbox_plugin_dns-0.21.14 → netbox_plugin_dns-0.21.16}/netbox_dns/signals/ipam_coupling.py

@@ -28,6 +28,9 @@ except ImportError:
 
 @receiver(post_clean, sender=IPAddress)
 def ip_address_check_permissions_save(instance, **kwargs):
+    if not instance.address:
+        return
+
     if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
         return
 

{netbox_plugin_dns-0.21.14 → netbox_plugin_dns-0.21.16}/netbox_dns/utilities/ipam_coupling.py

@@ -3,6 +3,13 @@ from utilities.permissions import resolve_permission
 
 from netbox_dns.models import Record, RecordTypeChoices, RecordStatusChoices
 
+try:
+    # NetBox 3.5.0 - 3.5.7, 3.5.9+
+    from extras.plugins import get_plugin_config
+except ImportError:
+    # NetBox 3.5.8
+    from extras.plugins.utils import get_plugin_config
+
 
 class DNSPermissionDenied(Exception):
     pass
@@ -27,9 +34,19 @@ def address_record_type(ip_address):
 
 
 def address_record_status(ip_address):
+    ip_active_status_list = get_plugin_config(
+        "netbox_dns",
+        "ipam_coupling_ip_active_status_list",
+        (
+            IPAddressStatusChoices.STATUS_ACTIVE,
+            IPAddressStatusChoices.STATUS_DHCP,
+            IPAddressStatusChoices.STATUS_SLAAC,
+        ),
+    )
+
     return (
         RecordStatusChoices.STATUS_ACTIVE
-        if ip_address.status == IPAddressStatusChoices.STATUS_ACTIVE
+        if ip_address.status in ip_active_status_list
         else RecordStatusChoices.STATUS_INACTIVE
     )
 

{netbox_plugin_dns-0.21.14 → netbox_plugin_dns-0.21.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.21.14"
+version = "0.21.16"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pe-netbox-dns@hindenburgring.com>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"