netbox-plugin-dns 1.2.7b3__tar.gz → 1.2.9__tar.gz

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-plugin-dns
-Version: 1.2.7b3
+Version: 1.2.9
 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
@@ -8,11 +8,12 @@ Project-URL: Documentation, https://github.com/peteeckel/netbox-plugin-dns/blob/
 Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
 Project-URL: Issues, https://github.com/peteeckel/netbox-plugin-dns/issues
 Keywords: netbox,netbox-plugin,dns
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dnspython
+Dynamic: license-file
 
 # NetBox DNS
 The NetBox DNS plugin enables NetBox to manage operational DNS data such as name servers, zones, records and views, as well as registration data for domains. It can automate tasks like creating PTR records, generating zone serial numbers, NS and SOA records, as well as validate names and values values for resource records to ensure zone data is consistent, up-to-date and compliant with to the relevant RFCs.

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/__init__.py

@@ -3,11 +3,8 @@ from django.core.exceptions import ImproperlyConfigured
 
 from netbox.plugins import PluginConfig
 from netbox.plugins.utils import get_plugin_config
-from ipam.choices import IPAddressStatusChoices
 
-from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
-
-__version__ = "1.2.7-beta3"
+__version__ = "1.2.9"
 
 
 def _check_list(setting):
@@ -32,31 +29,65 @@ class DNSConfig(PluginConfig):
         "zone_soa_retry": 7200,
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
-        "zone_active_status": [
-            ZoneStatusChoices.STATUS_ACTIVE,
-            ZoneStatusChoices.STATUS_DYNAMIC,
-        ],
-        "filter_record_types": [],
-        "record_active_status": [
-            RecordStatusChoices.STATUS_ACTIVE,
+        "zone_active_status": ["active", "dynamic"],
+        "zone_expiration_warning_days": 30,
+        "filter_record_types": [
+            # Obsolete or experimental RRTypes
+            "A6",  # RFC 6563: Historic
+            "AFSDB",  # RFC 5864: Obsolete
+            "APL",  # RFC 3123: Experimental
+            "AVC",  # https://www.iana.org/assignments/dns-parameters/AVC/avc-completed-template
+            "GPOS",  # RFC 1712: Experimental
+            "KEY",  # RFC 3755: Obsolete
+            "L32",  # RFC 6742: Experimental
+            "L64",  # RFC 6742: Experimental
+            "LP",  # RFC 6742: Experimental
+            "MB",  # RFC 2505: Unlikely to ever be adopted
+            "MD",  # RFC 973: Obsolete
+            "MF",  # RFC 973: Obsolete
+            "MG",  # RFC 2505: Unlikely to ever be adopted
+            "MINFO",  # RFC 2505: Unlikely to ever be adopted
+            "MR",  # RFC 2505: Unlikely to ever be adopted
+            "NID",  # RFC 6742: Experimental
+            "NINFO",  # Application expired
+            "NULL",  # RFC 1035: Obsolete
+            "NXT",  # RFC 3755: Obsolete
+            "SIG",  # RFC 3755: Obsolete
+            "SPF",  # RFC 7208: Obsolete
+            "WKS",  # RFC 1127: Not recommended
+            # RRTypes with no current use by any notable application
+            # (see https://en.wikipedia.org/wiki/List_of_DNS_record_types)
+            "RP",
+            "ISDN",
+            "RT",
+            "X25",
+            "NSAP",
+            "NSAP_PTR",
+            "PX",
+            "TYPE0",  # Reserved
+            "UNSPEC",  # Reserved
+            # DNSSEC RRTypes that are usually not manually maintained
+            "NSEC",
+            "NSEC3",
+            "RRSIG",
         ],
+        "filter_record_types+": [],
+        "filter_record_types-": [],
+        "custom_record_types": [],
+        "record_active_status": ["active"],
         "dnssync_disabled": False,
-        "dnssync_ipaddress_active_status": [
-            IPAddressStatusChoices.STATUS_ACTIVE,
-            IPAddressStatusChoices.STATUS_DHCP,
-            IPAddressStatusChoices.STATUS_SLAAC,
-        ],
+        "dnssync_ipaddress_active_status": ["active", "dhcp", "slaac"],
         "dnssync_conflict_deactivate": False,
         "dnssync_minimum_zone_labels": 2,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
         "tolerate_leading_underscore_types": [
-            RecordTypeChoices.CNAME,
-            RecordTypeChoices.DNAME,
-            RecordTypeChoices.SRV,
-            RecordTypeChoices.SVCB,
-            RecordTypeChoices.TLSA,
-            RecordTypeChoices.TXT,
+            "CNAME",
+            "DNAME",
+            "SRV",
+            "SVCB",
+            "TLSA",
+            "TXT",
         ],
         "tolerate_non_rfc1035_types": [],
         "enable_root_zones": False,
@@ -94,16 +125,12 @@ class DNSConfig(PluginConfig):
             "record_active_status",
             "dnssync_ipaddress_active_status",
             "tolerate_leading_underscore_types",
+            "filter_record_types",
+            "filter_record_types+",
+            "custom_record_types",
         ):
             _check_list(setting)
 
-        # +
-        # TODO: Remove this workaround as soon as it's no longer required
-        #
-        # Force loading views so the register_model_view is run for all views
-        # -
-        import netbox_dns.views  # noqa: F401
-
 
 #
 # Initialize plugin config

netbox_plugin_dns-1.2.9/netbox_dns/api/field_serializers.py

@@ -0,0 +1,25 @@
+from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
+
+from netbox_dns.utilities import iso8601_to_int
+
+__all__ = ("TimePeriodField",)
+
+
+class TimePeriodField(serializers.IntegerField):
+    default_error_messages = {
+        "invalid": _(
+            "Enter a positive integer or an ISO8601 duration (W, M and Y are not supported)."
+        ),
+    }
+
+    def to_internal_value(self, data):
+        try:
+            return iso8601_to_int(data)
+        except TypeError:
+            raise serializers.ValidationError(
+                "Enter a valid integer or ISO 8601 duration (W, M and Y are not supported)."
+            )
+
+    def to_representation(self, value):
+        return value

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/api/serializers_/dnssec_key_template.py

@@ -7,6 +7,7 @@ from tenancy.api.serializers_.tenants import TenantSerializer
 from netbox_dns.models import DNSSECKeyTemplate
 
 from ..nested_serializers import NestedDNSSECPolicySerializer
+from ..field_serializers import TimePeriodField
 
 
 __all__ = ("DNSSECKeyTemplateSerializer",)
@@ -16,6 +17,7 @@ class DNSSECKeyTemplateSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:dnsseckeytemplate-detail"
     )
+    lifetime = TimePeriodField(required=False, allow_null=True)
     policies = NestedDNSSECPolicySerializer(
         many=True,
         read_only=True,

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/api/serializers_/dnssec_policy.py

@@ -8,6 +8,7 @@ from netbox_dns.models import DNSSECPolicy
 
 from .dnssec_key_template import DNSSECKeyTemplateSerializer
 from ..nested_serializers import NestedZoneSerializer, NestedZoneTemplateSerializer
+from ..field_serializers import TimePeriodField
 
 
 __all__ = ("DNSSECPolicySerializer",)
@@ -25,6 +26,18 @@ class DNSSECPolicySerializer(NetBoxModelSerializer):
         default=None,
         help_text=_("Key templates assigned to the policy"),
     )
+    dnskey_ttl = TimePeriodField(required=False, allow_null=True)
+    purge_keys = TimePeriodField(required=False, allow_null=True)
+    publish_safety = TimePeriodField(required=False, allow_null=True)
+    retire_safety = TimePeriodField(required=False, allow_null=True)
+    signatures_jitter = TimePeriodField(required=False, allow_null=True)
+    signatures_refresh = TimePeriodField(required=False, allow_null=True)
+    signatures_validity = TimePeriodField(required=False, allow_null=True)
+    signatures_validity_dnskey = TimePeriodField(required=False, allow_null=True)
+    max_zone_ttl = TimePeriodField(required=False, allow_null=True)
+    zone_propagation_delay = TimePeriodField(required=False, allow_null=True)
+    parent_ds_ttl = TimePeriodField(required=False, allow_null=True)
+    parent_propagation_delay = TimePeriodField(required=False, allow_null=True)
     zones = NestedZoneSerializer(
         many=True,
         read_only=True,

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/api/serializers_/record.py

@@ -8,6 +8,7 @@ from tenancy.api.serializers import TenantSerializer
 from netbox_dns.models import Record
 
 from ..nested_serializers import NestedZoneSerializer, NestedRecordSerializer
+from ..field_serializers import TimePeriodField
 
 
 __all__ = ("RecordSerializer",)
@@ -17,6 +18,7 @@ class RecordSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:record-detail"
     )
+    ttl = TimePeriodField(required=False, allow_null=True)
     ptr_record = NestedRecordSerializer(
         many=False,
         read_only=True,

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/api/serializers_/record_template.py

@@ -7,6 +7,7 @@ from tenancy.api.serializers import TenantSerializer
 from netbox_dns.models import RecordTemplate
 
 from ..nested_serializers import NestedZoneTemplateSerializer
+from ..field_serializers import TimePeriodField
 
 
 __all__ = ("RecordTemplateSerializer",)
@@ -16,6 +17,7 @@ class RecordTemplateSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:recordtemplate-detail"
     )
+    ttl = TimePeriodField(required=False, allow_null=True)
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
     zone_templates = NestedZoneTemplateSerializer(
         many=True,

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/api/serializers_/zone.py

@@ -12,6 +12,7 @@ from .zone_template import ZoneTemplateSerializer
 from .dnssec_policy import DNSSECPolicySerializer
 
 from ..nested_serializers import NestedZoneSerializer
+from ..field_serializers import TimePeriodField
 
 from netbox_dns.models import Zone
 
@@ -38,6 +39,8 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Nameservers for the zone"),
     )
+    default_ttl = TimePeriodField(required=False, allow_null=True)
+    soa_ttl = TimePeriodField(required=False, allow_null=True)
     soa_mname = NameServerSerializer(
         nested=True,
         many=False,
@@ -51,6 +54,10 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Contact email for the zone"),
     )
+    soa_refresh = TimePeriodField(required=False, allow_null=True)
+    soa_retry = TimePeriodField(required=False, allow_null=True)
+    soa_expire = TimePeriodField(required=False, allow_null=True)
+    soa_minimum = TimePeriodField(required=False, allow_null=True)
     rfc2317_parent_zone = NestedZoneSerializer(
         many=False,
         read_only=True,
@@ -120,7 +127,7 @@ class ZoneSerializer(NetBoxModelSerializer):
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
     def validate(self, data):
-        if (template := data.get("template")) is not None:
+        if isinstance(data, dict) and (template := data.get("template")) is not None:
             template.apply_to_zone_data(data)
 
         return super().validate(data)
@@ -183,8 +190,11 @@ class ZoneSerializer(NetBoxModelSerializer):
             "rfc2317_child_zones",
             "dnssec_policy",
             "inline_signing",
+            "parental_agents",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "tech_c",
             "admin_c",

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/choices/dnssec_key_template.py

@@ -4,7 +4,7 @@ from django.utils.translation import gettext_lazy as _
 
 from utilities.choices import ChoiceSet
 
-from .utilities import define_choice_attributes
+from .utilities import initialize_choice_names
 
 DEPRECATED_ALGORITHMS = (
     Algorithm.RSAMD5,
@@ -54,7 +54,7 @@ class DNSSECKeyTemplateKeySizeChoices(ChoiceSet):
     ]
 
 
-@define_choice_attributes()
+@initialize_choice_names
 class DNSSECKeyTemplateAlgorithmChoices(ChoiceSet):
     CHOICES = [
         (algorithm.name, f"{algorithm.name} ({algorithm.value})")

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/choices/dnssec_policy.py

@@ -4,7 +4,7 @@ from django.utils.translation import gettext_lazy as _
 
 from utilities.choices import ChoiceSet
 
-from .utilities import define_choice_attributes
+from .utilities import initialize_choice_names
 
 DEPRECATED_DIGESTS = (
     DSDigest.NULL,
@@ -19,7 +19,7 @@ __all__ = (
 )
 
 
-@define_choice_attributes()
+@initialize_choice_names
 class DNSSECPolicyDigestChoices(ChoiceSet):
     CHOICES = [
         (digest.name, digest.name)

netbox_plugin_dns-1.2.9/netbox_dns/choices/record.py

@@ -0,0 +1,104 @@
+from dns import rdatatype, rdataclass
+
+from django.utils.translation import gettext_lazy as _
+
+from utilities.choices import ChoiceSet
+from netbox.plugins.utils import get_plugin_config
+
+from .utilities import initialize_choice_names
+
+
+__all__ = (
+    "RecordTypeChoices",
+    "RecordSelectableTypeChoices",
+    "RecordClassChoices",
+    "RecordStatusChoices",
+)
+
+
+def _get_config_option(option_name):
+    return list(
+        set(get_plugin_config("netbox_dns", option_name, []))
+        | set(get_plugin_config("netbox_dns", f"{option_name}+", []))
+        - set(get_plugin_config("netbox_dns", f"{option_name}-", []))
+    )
+
+
+class RecordTypeNames:
+    def __init__(self):
+        self.record_type_names = sorted(
+            [
+                rdtype.name
+                for rdtype in rdatatype.RdataType
+                if not rdatatype.is_metatype(rdtype)
+            ]
+            + _get_config_option("custom_record_types")
+        )
+
+    def __iter__(self):
+        for rdtype_name in self.record_type_names:
+            yield rdtype_name
+
+
+class RecordSelectableTypeNames:
+    def __init__(self, exclude_types=[]):
+        self.record_type_names = sorted(
+            [
+                rdtype.name
+                for rdtype in rdatatype.RdataType
+                if not rdatatype.is_metatype(rdtype)
+                and rdtype.name not in _get_config_option("filter_record_types")
+            ]
+            + _get_config_option("custom_record_types")
+        )
+
+    def __iter__(self):
+        for rdtype_name in self.record_type_names:
+            yield rdtype_name
+
+
+class RecordClassNames:
+    def __iter__(self):
+        for rdclass in rdataclass.RdataClass:
+            yield rdclass.name
+
+
+@initialize_choice_names
+class RecordTypeChoices(ChoiceSet):
+    def choices():
+        return RecordTypeNames()
+
+    CHOICES = [(name, name) for name in choices()]
+
+    SINGLETONS = [
+        rdtype.name for rdtype in rdatatype.RdataType if rdatatype.is_singleton(rdtype)
+    ]
+    CUSTOM_TYPES = _get_config_option("custom_record_types")
+
+
+@initialize_choice_names
+class RecordSelectableTypeChoices(ChoiceSet):
+    def choices():
+        return RecordSelectableTypeNames()
+
+    CHOICES = [(name, name) for name in choices()]
+
+
+@initialize_choice_names
+class RecordClassChoices(ChoiceSet):
+    def choices():
+        return RecordClassNames()
+
+    CHOICES = [(name, name) for name in choices()]
+
+
+class RecordStatusChoices(ChoiceSet):
+    key = "Record.status"
+
+    STATUS_ACTIVE = "active"
+    STATUS_INACTIVE = "inactive"
+
+    CHOICES = [
+        (STATUS_ACTIVE, _("Active"), "blue"),
+        (STATUS_INACTIVE, _("Inactive"), "red"),
+    ]

netbox_plugin_dns-1.2.9/netbox_dns/choices/utilities.py

@@ -0,0 +1,4 @@
+def initialize_choice_names(cls):
+    for choice in cls.CHOICES:
+        setattr(cls, choice[0], choice[0])
+    return cls

netbox_plugin_dns-1.2.9/netbox_dns/choices/zone.py

@@ -0,0 +1,119 @@
+from django.utils.translation import gettext_lazy as _
+
+from utilities.choices import ChoiceSet
+
+
+__all__ = (
+    "ZoneStatusChoices",
+    "ZoneEPPStatusChoices",
+)
+
+
+class ZoneStatusChoices(ChoiceSet):
+    key = "Zone.status"
+
+    STATUS_ACTIVE = "active"
+    STATUS_RESERVED = "reserved"
+    STATUS_DEPRECATED = "deprecated"
+    STATUS_PARKED = "parked"
+    STATUS_DYNAMIC = "dynamic"
+
+    CHOICES = [
+        (STATUS_ACTIVE, _("Active"), "blue"),
+        (STATUS_RESERVED, _("Reserved"), "cyan"),
+        (STATUS_DEPRECATED, _("Deprecated"), "red"),
+        (STATUS_PARKED, _("Parked"), "gray"),
+        (STATUS_DYNAMIC, _("Dynamic"), "orange"),
+    ]
+
+
+class ZoneEPPStatusChoices(ChoiceSet):
+    """
+    Reflects the EPP status of a zone registered as a domain. See
+    https://www.icann.org/resources/pages/epp-status-codes-2014-06-16-en
+    for details.
+    """
+
+    key = "Zone.epp_status"
+
+    EPP_STATUS_ADD_PERIOD = "addPeriod"
+    EPP_STATUS_AUTO_RENEW_PERIOD = "autoRenewPeriod"
+    EPP_STATUS_INACTIVE = "inactive"
+    EPP_STATUS_OK = "ok"
+    EPP_STATUS_PENDING_CREATE = "pendingCreate"
+    EPP_STATUS_PENDING_DELETE = "pendingDelete"
+    EPP_STATUS_PENDING_RENEW = "pendingRenew"
+    EPP_STATUS_PENDING_RESTORE = "pendingRestore"
+    EPP_STATUS_PENDING_TRANSFER = "pendingTransfer"
+    EPP_STATUS_PENDING_UPDATE = "pendingUpdate"
+    EPP_STATUS_REDEMPTION_PERIOD = "redemptionPeriod"
+    EPP_STATUS_RENEW_PERIOD = "renewPeriod"
+    EPP_STATUS_SERVER_DELETE_PROHIBITED = "serverDeleteProhibited"
+    EPP_STATUS_SERVER_HOLD = "serverHold"
+    EPP_STATUS_SERVER_RENER_PROHIBITED = "serverRenewProhibited"
+    EPP_STATUS_SERVER_TRANSFER_PROHIBITED = "serverTransferProhibited"
+    EPP_STATUS_SERVER_UPDATE_PROHIBITED = "serverUpdateProhibited"
+    EPP_STATUS_TRANSFER_PERIOD = "transferPeriod"
+    EPP_STATUS_CLIENT_DELETE_PROHIBITED = "clientDeleteProhibited"
+    EPP_STATUS_CLIENT_HOLD = "clientHold"
+    EPP_STATUS_CLIENT_RENEW_PROHIBITED = "clientRenewProhibited"
+    EPP_STATUS_CLIENT_TRANSFER_PROHIBITED = "clientTransferProhibited"
+    EPP_STATUS_CLIENT_UPDATE_PROHIBITED = "clientUpdateProhibited"
+
+    CHOICES = [
+        (EPP_STATUS_ADD_PERIOD, EPP_STATUS_ADD_PERIOD, "blue"),
+        (EPP_STATUS_AUTO_RENEW_PERIOD, EPP_STATUS_AUTO_RENEW_PERIOD, "blue"),
+        (EPP_STATUS_INACTIVE, EPP_STATUS_INACTIVE, "blue"),
+        (EPP_STATUS_OK, EPP_STATUS_OK, "blue"),
+        (EPP_STATUS_PENDING_CREATE, EPP_STATUS_PENDING_CREATE, "blue"),
+        (EPP_STATUS_PENDING_DELETE, EPP_STATUS_PENDING_DELETE, "blue"),
+        (EPP_STATUS_PENDING_RENEW, EPP_STATUS_PENDING_RENEW, "blue"),
+        (EPP_STATUS_PENDING_RESTORE, EPP_STATUS_PENDING_RESTORE, "blue"),
+        (EPP_STATUS_PENDING_TRANSFER, EPP_STATUS_PENDING_TRANSFER, "blue"),
+        (EPP_STATUS_PENDING_UPDATE, EPP_STATUS_PENDING_UPDATE, "blue"),
+        (EPP_STATUS_REDEMPTION_PERIOD, EPP_STATUS_REDEMPTION_PERIOD, "blue"),
+        (EPP_STATUS_RENEW_PERIOD, EPP_STATUS_RENEW_PERIOD, "blue"),
+        (
+            EPP_STATUS_SERVER_DELETE_PROHIBITED,
+            EPP_STATUS_SERVER_DELETE_PROHIBITED,
+            "blue",
+        ),
+        (EPP_STATUS_SERVER_HOLD, EPP_STATUS_SERVER_HOLD, "blue"),
+        (
+            EPP_STATUS_SERVER_RENER_PROHIBITED,
+            EPP_STATUS_SERVER_RENER_PROHIBITED,
+            "blue",
+        ),
+        (
+            EPP_STATUS_SERVER_TRANSFER_PROHIBITED,
+            EPP_STATUS_SERVER_TRANSFER_PROHIBITED,
+            "blue",
+        ),
+        (
+            EPP_STATUS_SERVER_UPDATE_PROHIBITED,
+            EPP_STATUS_SERVER_UPDATE_PROHIBITED,
+            "blue",
+        ),
+        (EPP_STATUS_TRANSFER_PERIOD, EPP_STATUS_TRANSFER_PERIOD, "blue"),
+        (
+            EPP_STATUS_CLIENT_DELETE_PROHIBITED,
+            EPP_STATUS_CLIENT_DELETE_PROHIBITED,
+            "cyan",
+        ),
+        (EPP_STATUS_CLIENT_HOLD, EPP_STATUS_CLIENT_HOLD, "cyan"),
+        (
+            EPP_STATUS_CLIENT_RENEW_PROHIBITED,
+            EPP_STATUS_CLIENT_RENEW_PROHIBITED,
+            "cyan",
+        ),
+        (
+            EPP_STATUS_CLIENT_TRANSFER_PROHIBITED,
+            EPP_STATUS_CLIENT_TRANSFER_PROHIBITED,
+            "cyan",
+        ),
+        (
+            EPP_STATUS_CLIENT_UPDATE_PROHIBITED,
+            EPP_STATUS_CLIENT_UPDATE_PROHIBITED,
+            "cyan",
+        ),
+    ]

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/fields/timeperiod.py

@@ -1,7 +1,7 @@
 from django.forms import Field, TextInput
-from django.utils.dateparse import parse_duration
 from django.core.exceptions import ValidationError
 
+from netbox_dns.utilities import iso8601_to_int
 
 __all__ = ("TimePeriodField",)
 
@@ -20,17 +20,11 @@ class TimePeriodField(Field):
             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)"
-                )
+            return iso8601_to_int(value)
+        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)

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/filtersets/dnssec_key_template.py

@@ -27,13 +27,13 @@ class DNSSECKeyTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         choices=DNSSECKeyTemplateKeySizeChoices,
     )
 
-    policies_id = django_filters.ModelMultipleChoiceFilter(
+    policy_id = django_filters.ModelMultipleChoiceFilter(
         field_name="policies",
         queryset=DNSSECPolicy.objects.all(),
         to_field_name="id",
         label=_("DNSSEC Policy IDs"),
     )
-    policies = django_filters.ModelMultipleChoiceFilter(
+    policy = django_filters.ModelMultipleChoiceFilter(
         field_name="policies__name",
         queryset=DNSSECPolicy.objects.all(),
         to_field_name="name",

{netbox_plugin_dns-1.2.7b3 → netbox_plugin_dns-1.2.9}/netbox_dns/filtersets/dnssec_policy.py

@@ -10,6 +10,7 @@ from utilities.filters import MultiValueCharFilter
 from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate, Zone, ZoneTemplate
 from netbox_dns.choices import DNSSECPolicyStatusChoices
 
+
 __all__ = ("DNSSECPolicyFilterSet",)
 
 
@@ -47,37 +48,37 @@ class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         method="filter_cds_digest_types",
         label=_("CDS Digest Types"),
     )
-    key_templates = django_filters.ModelMultipleChoiceFilter(
+    key_template = django_filters.ModelMultipleChoiceFilter(
         field_name="key_templates__name",
         queryset=DNSSECKeyTemplate.objects.all(),
         to_field_name="name",
         label=_("DNSSEC Key Templates"),
     )
-    key_templates_id = django_filters.ModelMultipleChoiceFilter(
+    key_template_id = django_filters.ModelMultipleChoiceFilter(
         field_name="key_templates",
         queryset=DNSSECKeyTemplate.objects.all(),
         to_field_name="id",
         label=_("DNSSEC Key Template IDs"),
     )
-    zones = django_filters.ModelMultipleChoiceFilter(
+    zone = django_filters.ModelMultipleChoiceFilter(
         field_name="zones__name",
         queryset=Zone.objects.all(),
         to_field_name="name",
         label=_("Zones"),
     )
-    zones_id = django_filters.ModelMultipleChoiceFilter(
+    zone_id = django_filters.ModelMultipleChoiceFilter(
         field_name="zones",
         queryset=Zone.objects.all(),
         to_field_name="id",
         label=_("Zone IDs"),
     )
-    zone_templates = django_filters.ModelMultipleChoiceFilter(
+    zone_template = django_filters.ModelMultipleChoiceFilter(
         field_name="zone_templates__name",
         queryset=ZoneTemplate.objects.all(),
         to_field_name="name",
         label=_("Zone Templates"),
     )
-    zone_templates_id = django_filters.ModelMultipleChoiceFilter(
+    zone_template_id = django_filters.ModelMultipleChoiceFilter(
         field_name="zone_templates",
         queryset=ZoneTemplate.objects.all(),
         to_field_name="id",