netbox-plugin-dns 0.21.8__py3-none-any.whl → 0.21.11__py3-none-any.whl

netbox_dns/__init__.py

@@ -9,7 +9,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.21.8"
+__version__ = "0.21.11"
 
 
 class DNSConfig(PluginConfig):

netbox_dns/management/commands/setup_coupling.py

@@ -14,62 +14,76 @@ class Command(BaseCommand):
         parser.add_argument(
             "--remove", action="store_true", help="Remove custom fields"
         )
+        parser.add_argument("--verbose", action="store_true", help="Verbose output")
 
     def handle(self, *model_names, **options):
         ipaddress_object_type = ContentType.objects.get_for_model(IPAddress)
-        zone_object_type = ContentType.objects.get_for_model(Zone)
-        record_object_type = ContentType.objects.get_for_model(Record)
-        customfields = ("ipaddress_dns_record_name", "ipaddress_dns_zone_id")
 
         if options["remove"]:
-            for cf in customfields:
+            for cf in (
+                "ipaddress_dns_record_name",
+                "ipaddress_dns_record_ttl",
+                "ipaddress_dns_zone_id",
+            ):
                 try:
                     CustomField.objects.get(
                         name=cf, content_types=ipaddress_object_type
                     ).delete()
+                    if options.get("verbose"):
+                        self.stdout.write(f"Custom field '{cf}' removed")
                 except:
-                    self.stderr.write(f"Custom field '{cf}' does not exist!")
-                else:
-                    self.stdout.write(f"Custom field '{cf}' removed")
+                    pass
 
         else:
-            msg = ""
-            for cf in customfields:
-                try:
-                    CustomField.objects.get(
-                        name=cf, content_types=ipaddress_object_type
-                    )
-                except:
-                    pass
-                else:
-                    msg += f"custom fields '{cf}' already exists, "
-            if msg != "":
-                raise CommandError(
-                    "\n".join(
-                        (
-                            "Can't setup IPAM-DNS coupling:",
-                            msg,
-                            "Remove them with NetBox command:",
-                            "python manage.py setup_coupling --remove",
-                        )
+            if not CustomField.objects.filter(
+                name="ipaddress_dns_record_name",
+                type=CustomFieldTypeChoices.TYPE_TEXT,
+                content_types=ipaddress_object_type,
+            ).exists():
+                cf_name = CustomField.objects.create(
+                    name="ipaddress_dns_record_name",
+                    label="Name",
+                    type=CustomFieldTypeChoices.TYPE_TEXT,
+                    required=False,
+                    group_name="DNS",
+                )
+                cf_name.content_types.set([ipaddress_object_type])
+                if options.get("verbose"):
+                    self.stdout.write(
+                        "Created custom field 'ipaddress_dns_record_name'"
                     )
+
+            if not CustomField.objects.filter(
+                name="ipaddress_dns_record_ttl",
+                type=CustomFieldTypeChoices.TYPE_INTEGER,
+                content_types=ipaddress_object_type,
+            ).exists():
+                cf_ttl = CustomField.objects.create(
+                    name="ipaddress_dns_record_ttl",
+                    label="TTL",
+                    type=CustomFieldTypeChoices.TYPE_INTEGER,
+                    validation_minimum=0,
+                    validation_maximum=2147483647,
+                    required=False,
+                    group_name="DNS",
                 )
+                cf_ttl.content_types.set([ipaddress_object_type])
+                if options.get("verbose"):
+                    self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
-            cf_name = CustomField.objects.create(
-                name="ipaddress_dns_record_name",
-                label="Name",
-                type=CustomFieldTypeChoices.TYPE_TEXT,
-                required=False,
-                group_name="DNS",
-            )
-            cf_name.content_types.set([ipaddress_object_type])
-            cf_zone = CustomField.objects.create(
+            if not CustomField.objects.filter(
                 name="ipaddress_dns_zone_id",
-                label="Zone",
                 type=CustomFieldTypeChoices.TYPE_OBJECT,
-                object_type=zone_object_type,
-                required=False,
-                group_name="DNS",
-            )
-            cf_zone.content_types.set([ipaddress_object_type])
-            self.stdout.write(f"Custom fields for IPAM-DNS coupling added")
+                content_types=ipaddress_object_type,
+            ).exists():
+                cf_zone = CustomField.objects.create(
+                    name="ipaddress_dns_zone_id",
+                    label="Zone",
+                    type=CustomFieldTypeChoices.TYPE_OBJECT,
+                    object_type=ContentType.objects.get_for_model(Zone),
+                    required=False,
+                    group_name="DNS",
+                )
+                cf_zone.content_types.set([ipaddress_object_type])
+                if options.get("verbose"):
+                    self.stdout.write("Created custom field 'ipaddress_dns_zone_id'")

netbox_dns/signals/ipam_coupling.py

@@ -48,7 +48,7 @@ def ip_address_check_permissions_save(instance, **kwargs):
 
             record = get_address_record(instance)
             if record is not None:
-                name, zone_id = ipaddress_cf_data(instance)
+                name, ttl, zone_id = ipaddress_cf_data(instance)
                 if zone_id is not None:
                     update_address_record(record, instance)
                     record.full_clean()
@@ -68,6 +68,10 @@ def ip_address_check_permissions_save(instance, **kwargs):
             if value is not None:
                 exc.error_dict["cf_ipaddress_dns_record_name"] = value
 
+            value = exc.error_dict.pop("ttl", None)
+            if value is not None:
+                exc.error_dict["cf_ipaddress_dns_record_ttl"] = value
+
             value = exc.error_dict.pop("value", None)
             if value is not None:
                 exc.error_dict["cf_ipaddress_dns_record_name"] = value
@@ -108,13 +112,14 @@ def ip_address_update_dns_information(instance, **kwargs):
     if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
         return
 
-    name, zone_id = ipaddress_cf_data(instance)
+    name, ttl, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is not None:
         instance.dns_name = f"{name}.{Zone.objects.get(pk=zone_id).name}"
     else:
         instance.dns_name = ""
         instance.custom_field_data["ipaddress_dns_record_name"] = None
+        instance.custom_field_data["ipaddress_dns_record_ttl"] = None
         instance.custom_field_data["ipaddress_dns_zone_id"] = None
 
 
@@ -126,7 +131,7 @@ def ip_address_update_address_record(instance, **kwargs):
     if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
         return
 
-    name, zone_id = ipaddress_cf_data(instance)
+    name, ttl, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is None:
         #

netbox_dns/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from netbox.views.generic import ObjectChangeLogView
+from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
 
 from netbox_dns.models import View, Zone, Record, NameServer, Contact, Registrar
 from netbox_dns.views import (
@@ -78,6 +78,12 @@ urlpatterns = [
     path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
     path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
     path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
+    path(
+        "zones/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="zone_journal",
+        kwargs={"model": Zone},
+    ),
     path(
         "zones/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
@@ -126,6 +132,12 @@ urlpatterns = [
         NameServerDeleteView.as_view(),
         name="nameserver_delete",
     ),
+    path(
+        "nameservers/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="nameserver_journal",
+        kwargs={"model": NameServer},
+    ),
     path(
         "nameservers/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
@@ -153,6 +165,12 @@ urlpatterns = [
     path("records/<int:pk>/", RecordView.as_view(), name="record"),
     path("records/<int:pk>/edit/", RecordEditView.as_view(), name="record_edit"),
     path("records/<int:pk>/delete/", RecordDeleteView.as_view(), name="record_delete"),
+    path(
+        "records/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="record_journal",
+        kwargs={"model": Record},
+    ),
     path(
         "records/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
@@ -174,6 +192,12 @@ urlpatterns = [
     path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
     path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
     path("views/<int:pk>/zones/", ViewZoneListView.as_view(), name="view_zones"),
+    path(
+        "views/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="view_journal",
+        kwargs={"model": View},
+    ),
     path(
         "views/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
@@ -204,6 +228,12 @@ urlpatterns = [
         ContactZoneListView.as_view(),
         name="contact_zones",
     ),
+    path(
+        "contacts/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="contact_journal",
+        kwargs={"model": Contact},
+    ),
     path(
         "contacts/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
@@ -246,6 +276,12 @@ urlpatterns = [
         RegistrarZoneListView.as_view(),
         name="registrar_zones",
     ),
+    path(
+        "registrars/<int:pk>/journal/",
+        ObjectJournalView.as_view(),
+        name="registrar_journal",
+        kwargs={"model": Registrar},
+    ),
     path(
         "registrars/<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),

netbox_dns/utilities/ipam_coupling.py

@@ -10,12 +10,13 @@ class DNSPermissionDenied(Exception):
 
 def ipaddress_cf_data(ip_address):
     name = ip_address.custom_field_data.get("ipaddress_dns_record_name")
+    ttl = ip_address.custom_field_data.get("ipaddress_dns_record_ttl")
     zone_id = ip_address.custom_field_data.get("ipaddress_dns_zone_id")
 
     if name is None or zone_id is None:
-        return None, None
+        return None, None, None
 
-    return name, zone_id
+    return name, ttl, zone_id
 
 
 def address_record_type(ip_address):
@@ -35,7 +36,7 @@ def get_address_record(ip_address):
 
 
 def new_address_record(instance):
-    name, zone_id = ipaddress_cf_data(instance)
+    name, ttl, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is None:
         return None
@@ -43,6 +44,7 @@ def new_address_record(instance):
     return Record(
         name=name,
         zone_id=zone_id,
+        ttl=ttl,
         status=address_record_status(instance),
         type=address_record_type(instance),
         value=str(instance.address.ip),
@@ -52,9 +54,10 @@ def new_address_record(instance):
 
 
 def update_address_record(record, ip_address):
-    name, zone_id = ipaddress_cf_data(ip_address)
+    name, ttl, zone_id = ipaddress_cf_data(ip_address)
 
     record.name = name
+    record.ttl = ttl
     record.zone_id = zone_id
     record.status = address_record_status(ip_address)
     record.value = str(ip_address.address.ip)
@@ -79,9 +82,11 @@ def dns_changed(old, new):
     return any(
         (
             old.address.ip != new.address.ip,
-            old.custom_field_data["ipaddress_dns_record_name"]
-            != new.custom_field_data["ipaddress_dns_record_name"],
-            old.custom_field_data["ipaddress_dns_zone_id"]
-            != new.custom_field_data["ipaddress_dns_zone_id"],
+            old.custom_field_data.get("ipaddress_dns_record_name")
+            != new.custom_field_data.get("ipaddress_dns_record_name"),
+            old.custom_field_data.get("ipaddress_dns_record_ttl")
+            != new.custom_field_data.get("ipaddress_dns_record_ttl"),
+            old.custom_field_data.get("ipaddress_dns_zone_id")
+            != new.custom_field_data.get("ipaddress_dns_zone_id"),
         )
     )

{netbox_plugin_dns-0.21.8.dist-info → netbox_plugin_dns-0.21.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.21.8
+Version: 0.21.11
 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.8.dist-info → netbox_plugin_dns-0.21.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=0uRYkfDw8mWckKhzVPqFpsfw3h7yQyKXcY-kZWYI0HU,2254
+netbox_dns/__init__.py,sha256=nqAZJ1aCDHd5sPMF-Zp8G8Rd3TTkE9bk7bqgf47ARt0,2255
 netbox_dns/api/nested_serializers.py,sha256=Do1wWwWrZ5a4OUuW0Sj8AU3AVlaCu675PAG78RT3dv4,2616
 netbox_dns/api/serializers.py,sha256=RXSETFLwRZQrUus8uzMt7q7wuB-QVoiHBQumQQxyX3s,7673
 netbox_dns/api/urls.py,sha256=R9VmmWtdrjvr35i5d_SfZK2lGn6JzmPuWEKTQlZ8MJo,575
@@ -30,7 +30,7 @@ netbox_dns/graphql/schema.py,sha256=D_dDusogaI55tmGx_dr1owsgzXS5fd2S-kPZ7xcXxs8,
 netbox_dns/graphql/view.py,sha256=S_61hYlQCtPQen1lI1UQs38UBWKQTaWfUxzlbpO07zA,467
 netbox_dns/graphql/zone.py,sha256=QDBxocezhLSHBGDV4RJnmarBfOsiUTeE9KzBGJ3gJi8,467
 netbox_dns/management/commands/cleanup_database.py,sha256=fGkzOPXDsZWTlwetnerzkMmdpluV4vo34XXB_z8-yHU,6035
-netbox_dns/management/commands/setup_coupling.py,sha256=K842DptVDbDdY3m6ILs90ClJdnBVkLnI623bhVASeDo,2872
+netbox_dns/management/commands/setup_coupling.py,sha256=nfMZmbhIVzXUMKYLO_zT9hfJQTbdGDWeGKQqTaoDYMg,3676
 netbox_dns/management/commands/update_soa.py,sha256=qvlApMngTVpauj0CU0yeOy9r3lxxDciKorMxFsyvQhs,661
 netbox_dns/migrations/0001_initial.py,sha256=R9FbIQ7nO1ROb12NL8YQDkFQuP1r6-TtMcPwg4rwjus,4153
 netbox_dns/migrations/0001_squashed_netbox_dns_0_15.py,sha256=nxktsb-1oyiw1bHiBpnp8Vq4ugT0p0UMdJcYiq-UHoo,11466
@@ -70,7 +70,7 @@ netbox_dns/models/view.py,sha256=ljs3Q2xQR63ZOSyja5H7DEdFbm7MX2ZjlR6uNVrAsVo,920
 netbox_dns/models/zone.py,sha256=wfOgvGnu8aT0A6xwthI0KDFSU3XY-R-Ut75mJ5-GkfQ,18076
 netbox_dns/navigation.py,sha256=IutEr_TcPgDGzqTT1ZzV4IUABLSOFU9v364BfpCqbro,4587
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-netbox_dns/signals/ipam_coupling.py,sha256=l9Qcxh6A9hbb-zIU3h-Pis5xXA2ST_puNFgr1Yj1aRE,4801
+netbox_dns/signals/ipam_coupling.py,sha256=VXNNeOm47llpywpeGJJaPwmQiKWDBJ11m6-u_RMvijg,5043
 netbox_dns/tables/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/tables/contact.py,sha256=HpblHKrlQqQAPC59gvw8wUV3tc6UBAphHPE6CfN2uVM,747
 netbox_dns/tables/nameserver.py,sha256=7Ap0px5gAHtgk5XFMpZCHccy9N-v8UKy19GP7fdWuPc,819
@@ -93,9 +93,9 @@ netbox_dns/templates/netbox_dns/zone/managed_record.html,sha256=5P85eJuQOB7omih2
 netbox_dns/templates/netbox_dns/zone/record.html,sha256=1oIRGXOZAjwmTMkTgArfKyVrmL54Sh_IN7IAF3qYEKM,2218
 netbox_dns/templates/netbox_dns/zone/registration.html,sha256=3R5uqLXZxIJkp9_LVnTTgTV61mITfDPDDNofV7s4d1k,1283
 netbox_dns/templates/netbox_dns/zone.html,sha256=oz_GopJpox3aK_w6F5iqeKuA7-vROQceowGdgTfrj1Y,5852
-netbox_dns/urls.py,sha256=RMEDiyEmtHQzbjKy65ud6LofQYoEziIH7BvRaVs7kn0,8020
+netbox_dns/urls.py,sha256=_ET6CstIhCk-H2sVX0XXyfPmWQmCFHVndph_KkTY8-M,8987
 netbox_dns/utilities/__init__.py,sha256=UjYHNp3RxToJgjOLs6iPn5ekETCpES2yWUfuqJXkDyU,1915
-netbox_dns/utilities/ipam_coupling.py,sha256=Fmu03-W6WzGBFbUDt_DChz5tU1Cs7NOMsvSczutImhc,2420
+netbox_dns/utilities/ipam_coupling.py,sha256=VbPKTkcSJfgeSirnJ1yoX_HzBYgRgNYKNFjKB7kAPUA,2702
 netbox_dns/validators.py,sha256=mauW5-7a-sjTxyP4qWiRi-kfffGEj9Ma7N2o-BJjx38,2232
 netbox_dns/views/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/views/contact.py,sha256=6-oCfK98-submcUTmi0ejw7QBscNn3S9bnS0oUTXOaY,2235
@@ -104,7 +104,7 @@ netbox_dns/views/record.py,sha256=eT-M-rqhCrcmhpEyKOnQ8SWnxAVUgams5e86nVL9uc0,25
 netbox_dns/views/registrar.py,sha256=aznSKt1L5tILMLGgcZiBR7u7B8rNl-jM1B2-N0fTeK8,2072
 netbox_dns/views/view.py,sha256=uUvtlNEh5MYoEALvWWaCOqj_Zj8dpGOL2PUyg-UPfEA,1895
 netbox_dns/views/zone.py,sha256=j1wxqEQKYxkQv2DqOHo0gP6e_hZrD2RTyZhkx5CCXFE,3988
-netbox_plugin_dns-0.21.8.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-0.21.8.dist-info/METADATA,sha256=S4JWySqR8ji6ZGgefQCc9IzazWKjsoamMTRyiRz3Yos,3931
-netbox_plugin_dns-0.21.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-netbox_plugin_dns-0.21.8.dist-info/RECORD,,
+netbox_plugin_dns-0.21.11.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
+netbox_plugin_dns-0.21.11.dist-info/METADATA,sha256=OQbNPaFhPexDrIJ_z89_gKHe4zpLAAqJIAPW4Wx4cCc,3932
+netbox_plugin_dns-0.21.11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+netbox_plugin_dns-0.21.11.dist-info/RECORD,,