netbox-plugin-dns 1.2.5__tar.gz → 1.2.6__tar.gz

{netbox_plugin_dns-1.2.5/netbox_plugin_dns.egg-info → netbox_plugin_dns-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.5
+Version: 1.2.6
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_dns/__init__.py

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.2.5"
+__version__ = "1.2.6"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_dns/fields/__init__.py

@@ -2,3 +2,4 @@ from .network import *
 from .address import *
 from .rfc2317 import *
 from .ipam import *
+from .timeperiod import *

netbox_plugin_dns-1.2.6/netbox_dns/fields/timeperiod.py

@@ -0,0 +1,31 @@
+from django.forms import Field
+from django.utils.dateparse import parse_duration
+from django.core.exceptions import ValidationError
+
+
+__all__ = ("TimePeriodField",)
+
+
+class TimePeriodField(Field):
+    def to_python(self, value):
+        if not value:
+            return None
+
+        try:
+            return int(value)
+        except ValueError:
+            try:
+                duration = parse_duration(value)
+                if duration is None:
+                    raise TypeError
+                return int(duration.total_seconds())
+            except TypeError:
+                raise ValidationError(
+                    "Enter a valid integer or ISO 8601 duration (W, M and Y are not supported)"
+                )
+
+    def validate(self, value):
+        super().validate(value)
+
+        if value is not None and value < 0:
+            raise ValidationError("A time period cannot be negative.")

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_dns/forms/record.py

@@ -23,6 +23,7 @@ from tenancy.forms import TenancyForm, TenancyFilterForm
 from netbox_dns.models import View, Zone, Record
 from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
+from netbox_dns.fields import TimePeriodField
 
 
 __all__ = (
@@ -67,7 +68,7 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Disable PTR"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -112,16 +113,17 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
+            "name",
             "view_id",
             "zone_id",
-            "name",
             "fqdn",
             "type",
             "value",
-            "disable_ptr",
             "status",
-            "active",
+            "ttl",
+            "disable_ptr",
             "description",
+            "active",
             name=_("Attributes"),
         ),
         FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
@@ -154,6 +156,10 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    ttl = TimePeriodField(
+        required=False,
+        label=_("TTL"),
+    )
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
@@ -224,7 +230,7 @@ class RecordImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -286,7 +292,7 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_dns/forms/record_template.py

@@ -23,6 +23,7 @@ from tenancy.forms import TenancyForm, TenancyFilterForm
 from netbox_dns.models import RecordTemplate, ZoneTemplate
 from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
+from netbox_dns.fields import TimePeriodField
 
 
 __all__ = (
@@ -50,7 +51,7 @@ class RecordTemplateForm(TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Disable PTR"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -99,6 +100,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "type",
             "value",
             "status",
+            "ttl",
             "disable_ptr",
             "description",
             name=_("Attributes"),
@@ -129,6 +131,10 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
+    ttl = TimePeriodField(
+        required=False,
+        label=_("TTL"),
+    )
     disable_ptr = forms.NullBooleanField(
         required=False,
         label=_("Disable PTR"),
@@ -156,7 +162,7 @@ class RecordTemplateImportForm(NetBoxModelImportForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )
@@ -209,7 +215,7 @@ class RecordTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
         label=_("TTL"),
     )

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_dns/forms/zone.py

@@ -39,7 +39,7 @@ from netbox_dns.models import (
 )
 from netbox_dns.choices import ZoneStatusChoices
 from netbox_dns.utilities import name_to_unicode, network_to_reverse
-from netbox_dns.fields import RFC2317NetworkFormField
+from netbox_dns.fields import RFC2317NetworkFormField, TimePeriodField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
 
@@ -171,7 +171,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         label=_("Nameservers"),
         quick_add=QUICK_ADD,
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         help_text=_("Default TTL for new records in this zone"),
         validators=[MinValueValidator(1)],
@@ -181,7 +181,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Description"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=True,
         help_text=_("TTL for the SOA record of the zone"),
         validators=[MinValueValidator(1)],
@@ -199,25 +199,25 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         help_text=_("Mailbox of the zone's administrator"),
         label=_("SOA RName"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=True,
         help_text=_("Refresh interval for secondary nameservers"),
         validators=[MinValueValidator(1)],
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=True,
         help_text=_("Retry interval for secondary nameservers"),
         validators=[MinValueValidator(1)],
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=True,
         validators=[MinValueValidator(1)],
         help_text=_("Expire time after which the zone is considered unavailable"),
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=True,
         help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
         validators=[MinValueValidator(1)],
@@ -243,7 +243,7 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
     rfc2317_parent_managed = forms.BooleanField(
         required=False,
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )
@@ -530,11 +530,11 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("Nameservers"),
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         label=_("Default TTL"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=False,
         help_text=_("TTL for the SOA record of the zone"),
         label=_("SOA TTL"),
@@ -562,22 +562,22 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
         help_text=_("Refresh interval for secondary nameservers"),
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
         help_text=_("Retry interval for secondary nameservers"),
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
         help_text=_("Expire time after which the zone is considered unavailable"),
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
         help_text=_("Minimum TTL for negative results, e.g. NXRRSET, NXDOMAIN"),
         label=_("SOA Minimum TTL"),
@@ -590,7 +590,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
     rfc2317_parent_managed = forms.BooleanField(
         required=False,
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )
@@ -726,7 +726,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Nameservers"),
     )
-    default_ttl = forms.IntegerField(
+    default_ttl = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("Default TTL"),
@@ -736,7 +736,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Description"),
     )
-    soa_ttl = forms.IntegerField(
+    soa_ttl = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA TTL"),
@@ -760,22 +760,22 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         validators=[MinValueValidator(1), MaxValueValidator(4294967295)],
         label=_("SOA Serial"),
     )
-    soa_refresh = forms.IntegerField(
+    soa_refresh = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Refresh"),
     )
-    soa_retry = forms.IntegerField(
+    soa_retry = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Retry"),
     )
-    soa_expire = forms.IntegerField(
+    soa_expire = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Expire"),
     )
-    soa_minimum = forms.IntegerField(
+    soa_minimum = TimePeriodField(
         required=False,
         validators=[MinValueValidator(1)],
         label=_("SOA Minimum TTL"),
@@ -790,7 +790,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         widget=BulkEditNullBooleanSelect(),
         help_text=_(
-            "IPv4 reverse zone for deletgating the RFC2317 PTR records is managed in NetBox DNS"
+            "IPv4 reverse zone for delegating the RFC2317 PTR records is managed in NetBox DNS"
         ),
         label=_("RFC2317 Parent Managed"),
     )

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6/netbox_plugin_dns.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.5
+Version: 1.2.6
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/netbox_plugin_dns.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ netbox_dns/fields/address.py
 netbox_dns/fields/ipam.py
 netbox_dns/fields/network.py
 netbox_dns/fields/rfc2317.py
+netbox_dns/fields/timeperiod.py
 netbox_dns/filtersets/__init__.py
 netbox_dns/filtersets/nameserver.py
 netbox_dns/filtersets/record.py
@@ -52,6 +53,7 @@ netbox_dns/graphql/schema.py
 netbox_dns/graphql/types.py
 netbox_dns/locale/de/LC_MESSAGES/django.mo
 netbox_dns/locale/en/LC_MESSAGES/django.mo
+netbox_dns/locale/fr/LC_MESSAGES/django.mo
 netbox_dns/management/commands/cleanup_database.py
 netbox_dns/management/commands/cleanup_rrset_ttl.py
 netbox_dns/management/commands/rebuild_dnssync.py

{netbox_plugin_dns-1.2.5 → netbox_plugin_dns-1.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2.5"
+version = "1.2.6"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},