netbox-plugin-dns 1.2.10__py3-none-any.whl → 1.3.0__py3-none-any.whl

netbox_dns/forms/dnssec_key_template.py

@@ -37,19 +37,9 @@ __all__ = (
 
 
 class DNSSECKeyTemplateForm(TenancyForm, NetBoxModelForm):
-    lifetime = TimePeriodField(
-        required=False,
-    )
-
-    fieldsets = (
-        FieldSet("name", "description", name=_("Attributes")),
-        FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-        FieldSet("tags", name=_("Tags")),
-    )
-
     class Meta:
         model = DNSSECKeyTemplate
+
         fields = (
             "name",
             "description",
@@ -62,15 +52,65 @@ class DNSSECKeyTemplateForm(TenancyForm, NetBoxModelForm):
             "tags",
         )
 
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "type",
+            "lifetime",
+            "algorithm",
+            "key_size",
+            name=_("Key Properties"),
+        ),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
+    )
+
+    lifetime = TimePeriodField(
+        required=False,
+    )
+
 
 class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = DNSSECKeyTemplate
+
     fieldsets = (
-        FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "description", name=_("Attributes")),
-        FieldSet("policiy_id", name=_("Policies")),
-        FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
-        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
+        FieldSet(
+            "name",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "policiy_id",
+            name=_("Policies"),
+        ),
+        FieldSet(
+            "type",
+            "lifetime",
+            "algorithm",
+            "key_size",
+            name=_("Key Properties"),
+        ),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
     )
 
     name = forms.CharField(
@@ -109,6 +149,20 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
 
 class DNSSECKeyTemplateImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = DNSSECKeyTemplate
+
+        fields = (
+            "name",
+            "description",
+            "type",
+            "lifetime",
+            "algorithm",
+            "key_size",
+            "tenant",
+            "tags",
+        )
+
     lifetime = TimePeriodField(
         required=False,
         label=_("Lifetime"),
@@ -120,23 +174,41 @@ class DNSSECKeyTemplateImportForm(NetBoxModelImportForm):
         label=_("Tenant"),
     )
 
-    class Meta:
-        model = DNSSECKeyTemplate
-        fields = (
-            "name",
+
+class DNSSECKeyTemplateBulkEditForm(NetBoxModelBulkEditForm):
+    model = DNSSECKeyTemplate
+
+    fieldsets = (
+        FieldSet(
             "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
             "type",
             "lifetime",
             "algorithm",
             "key_size",
+            name=_("Key Properties"),
+        ),
+        FieldSet(
+            "tenant_group",
             "tenant",
-            "tags",
-        )
-
+            name=_("Tenancy"),
+        ),
+    )
 
-class DNSSECKeyTemplateBulkEditForm(NetBoxModelBulkEditForm):
-    model = DNSSECKeyTemplate
+    nullable_fields = (
+        "description",
+        "tenant",
+        "lifetime",
+        "key_size",
+    )
 
+    description = forms.CharField(
+        max_length=200,
+        required=False,
+        label=_("Description"),
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(DNSSECKeyTemplateTypeChoices),
         required=False,
@@ -156,11 +228,6 @@ class DNSSECKeyTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Key Size"),
     )
-    description = forms.CharField(
-        max_length=200,
-        required=False,
-        label=_("Description"),
-    )
     tenant_group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         required=False,
@@ -171,19 +238,3 @@ class DNSSECKeyTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Tenant"),
     )
-
-    fieldsets = (
-        FieldSet(
-            "description",
-            name=_("Attributes"),
-        ),
-        FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-    )
-
-    fields = (
-        "algorithm",
-        "key_size",
-    )
-
-    nullable_fields = ("description", "tenant", "lifetime", "key_size")

netbox_dns/forms/dnssec_policy.py

@@ -1,5 +1,3 @@
-from packaging.version import Version
-
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
@@ -16,7 +14,6 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
 )
-from utilities.release import load_release_data
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import BulkEditNullBooleanSelect
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
@@ -35,10 +32,39 @@ __all__ = (
     "DNSSECPolicyBulkEditForm",
 )
 
-QUICK_ADD = Version(load_release_data().version) >= Version("4.2.5")
-
 
 class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
+    class Meta:
+        model = DNSSECPolicy
+
+        fields = (
+            "name",
+            "description",
+            "status",
+            "key_templates",
+            "dnskey_ttl",
+            "purge_keys",
+            "publish_safety",
+            "retire_safety",
+            "signatures_jitter",
+            "signatures_refresh",
+            "signatures_validity",
+            "signatures_validity_dnskey",
+            "max_zone_ttl",
+            "zone_propagation_delay",
+            "create_cdnskey",
+            "cds_digest_types",
+            "parent_ds_ttl",
+            "parent_propagation_delay",
+            "use_nsec3",
+            "nsec3_iterations",
+            "nsec3_opt_out",
+            "nsec3_salt_size",
+            "tenant_group",
+            "tenant",
+            "tags",
+        )
+
     fieldsets = (
         FieldSet(
             "name",
@@ -74,8 +100,15 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "nsec3_salt_size",
             name=_("Proof of Non-Existence"),
         ),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-        FieldSet("tags", name=_("Tags")),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
     )
 
     key_templates = DynamicModelMultipleChoiceField(
@@ -83,7 +116,7 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         required=False,
         label=_("Key Templates"),
         help_text=_("Select CSK or KSK/ZSK templates for signing"),
-        quick_add=QUICK_ADD,
+        quick_add=True,
     )
     dnskey_ttl = TimePeriodField(
         required=False,
@@ -146,41 +179,16 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
         placeholder=DNSSECPolicy.get_fallback_setting("parent_propagation_delay"),
     )
 
-    class Meta:
-        model = DNSSECPolicy
-        fields = (
-            "name",
-            "description",
-            "status",
-            "key_templates",
-            "dnskey_ttl",
-            "purge_keys",
-            "publish_safety",
-            "retire_safety",
-            "signatures_jitter",
-            "signatures_refresh",
-            "signatures_validity",
-            "signatures_validity_dnskey",
-            "max_zone_ttl",
-            "zone_propagation_delay",
-            "create_cdnskey",
-            "cds_digest_types",
-            "parent_ds_ttl",
-            "parent_propagation_delay",
-            "use_nsec3",
-            "nsec3_iterations",
-            "nsec3_opt_out",
-            "nsec3_salt_size",
-            "tenant_group",
-            "tenant",
-            "tags",
-        )
-
 
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = DNSSECPolicy
+
     fieldsets = (
-        FieldSet("q", "filter_id", "tag"),
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
         FieldSet(
             "name",
             "description",
@@ -220,8 +228,15 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "nsec3_salt_size",
             name=_("Proof of Non-Existence"),
         ),
-        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
-        FieldSet("tags", name=_("Tags")),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
     )
 
     name = forms.CharField(
@@ -334,6 +349,35 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
 
 class DNSSECPolicyImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = DNSSECPolicy
+
+        fields = (
+            "name",
+            "description",
+            "key_templates",
+            "dnskey_ttl",
+            "purge_keys",
+            "publish_safety",
+            "retire_safety",
+            "signatures_jitter",
+            "signatures_refresh",
+            "signatures_validity",
+            "signatures_validity_dnskey",
+            "max_zone_ttl",
+            "zone_propagation_delay",
+            "create_cdnskey",
+            "cds_digest_types",
+            "parent_ds_ttl",
+            "parent_propagation_delay",
+            "use_nsec3",
+            "nsec3_iterations",
+            "nsec3_opt_out",
+            "nsec3_salt_size",
+            "tenant",
+            "tags",
+        )
+
     status = CSVChoiceField(
         choices=DNSSECPolicyStatusChoices,
         required=False,
@@ -394,12 +438,17 @@ class DNSSECPolicyImportForm(NetBoxModelImportForm):
         label=_("Tenant"),
     )
 
-    class Meta:
-        model = DNSSECPolicy
-        fields = (
-            "name",
+
+class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
+    model = DNSSECPolicy
+
+    fieldsets = (
+        FieldSet(
             "description",
             "key_templates",
+            name=_("Attributes"),
+        ),
+        FieldSet(
             "dnskey_ttl",
             "purge_keys",
             "publish_safety",
@@ -410,21 +459,52 @@ class DNSSECPolicyImportForm(NetBoxModelImportForm):
             "signatures_validity_dnskey",
             "max_zone_ttl",
             "zone_propagation_delay",
+            name=_("Timing"),
+        ),
+        FieldSet(
             "create_cdnskey",
             "cds_digest_types",
             "parent_ds_ttl",
             "parent_propagation_delay",
+            name=_("Parent Delegation"),
+        ),
+        FieldSet(
             "use_nsec3",
             "nsec3_iterations",
             "nsec3_opt_out",
             "nsec3_salt_size",
+            name=_("Proof of Non-Existence"),
+        ),
+        FieldSet(
+            "tenant_group",
             "tenant",
-            "tags",
-        )
-
+            name=_("Tenancy"),
+        ),
+    )
 
-class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
-    model = DNSSECPolicy
+    nullable_fields = (
+        "description",
+        "tenant",
+        "dnskey_ttl",
+        "purge_keys",
+        "publish_safety",
+        "retire_safety",
+        "signatures_jitter",
+        "signatures_refresh",
+        "signatures_validity",
+        "signatures_validity_dnskey",
+        "max_zone_ttl",
+        "zone_propagation_delay",
+        "cds_digest_types",
+        "parent_ds_ttl",
+        "parent_propagation_delay",
+        "nsec3_iterations",
+        "nsec3_opt_out",
+        "nsec3_salt_size",
+        "cds_digest_types",
+        "parent_ds_ttl",
+        "parent_propagation_delay",
+    )
 
     description = forms.CharField(
         max_length=200,
@@ -523,66 +603,6 @@ class DNSSECPolicyBulkEditForm(NetBoxModelBulkEditForm):
         label=_("Tenant"),
     )
 
-    fieldsets = (
-        FieldSet(
-            "description",
-            "key_templates",
-            name=_("Attributes"),
-        ),
-        FieldSet(
-            "dnskey_ttl",
-            "purge_keys",
-            "publish_safety",
-            "retire_safety",
-            "signatures_jitter",
-            "signatures_refresh",
-            "signatures_validity",
-            "signatures_validity_dnskey",
-            "max_zone_ttl",
-            "zone_propagation_delay",
-            name=_("Timing"),
-        ),
-        FieldSet(
-            "create_cdnskey",
-            "cds_digest_types",
-            "parent_ds_ttl",
-            "parent_propagation_delay",
-            name=_("Parent Delegation"),
-        ),
-        FieldSet(
-            "use_nsec3",
-            "nsec3_iterations",
-            "nsec3_opt_out",
-            "nsec3_salt_size",
-            name=_("Proof of Non-Existence"),
-        ),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-    )
-
-    nullable_fields = (
-        "description",
-        "tenant",
-        "dnskey_ttl",
-        "purge_keys",
-        "publish_safety",
-        "retire_safety",
-        "signatures_jitter",
-        "signatures_refresh",
-        "signatures_validity",
-        "signatures_validity_dnskey",
-        "max_zone_ttl",
-        "zone_propagation_delay",
-        "cds_digest_types",
-        "parent_ds_ttl",
-        "parent_propagation_delay",
-        "nsec3_iterations",
-        "nsec3_opt_out",
-        "nsec3_salt_size",
-        "cds_digest_types",
-        "parent_ds_ttl",
-        "parent_propagation_delay",
-    )
-
     def clean_cds_digest_types(self, *args, **kwargs):
         if not (
             cds_digest_types := self.cleaned_data.get("cds_digest_types")

netbox_dns/forms/nameserver.py

@@ -31,6 +31,34 @@ __all__ = (
 
 
 class NameServerForm(TenancyForm, NetBoxModelForm):
+    class Meta:
+        model = NameServer
+
+        fields = (
+            "name",
+            "description",
+            "tags",
+            "tenant_group",
+            "tenant",
+        )
+
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            name=_("Nameserver"),
+        ),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
+    )
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -43,20 +71,30 @@ class NameServerForm(TenancyForm, NetBoxModelForm):
         label=_("Name"),
     )
 
-    fieldsets = (
-        FieldSet("name", "description", name=_("Nameserver")),
-        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
-        FieldSet("tags", name=_("Tags")),
-    )
-
-    class Meta:
-        model = NameServer
-        fields = ("name", "description", "tags", "tenant_group", "tenant")
-
 
 class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = NameServer
 
+    fieldsets = (
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
+        FieldSet(
+            "name",
+            "zone_id",
+            "soa_zone_id",
+            "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
+    )
+
     name = forms.CharField(
         required=False,
         label=_("Name"),
@@ -79,14 +117,18 @@ class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
     tag = TagFilterField(NameServer)
 
-    fieldsets = (
-        FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "zone_id", "soa_zone_id", "description", name=_("Attributes")),
-        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
-    )
-
 
 class NameServerImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = NameServer
+
+        fields = (
+            "name",
+            "description",
+            "tenant",
+            "tags",
+        )
+
     name = forms.CharField(
         label=_("Name"),
     )
@@ -97,19 +139,24 @@ class NameServerImportForm(NetBoxModelImportForm):
         label=_("Tenant"),
     )
 
-    class Meta:
-        model = NameServer
 
-        fields = (
-            "name",
+class NameServerBulkEditForm(NetBoxModelBulkEditForm):
+    model = NameServer
+
+    fieldsets = (
+        FieldSet(
             "description",
+            "tenant_group",
             "tenant",
             "tags",
-        )
-
+            name=_("Attributes"),
+        ),
+    )
 
-class NameServerBulkEditForm(NetBoxModelBulkEditForm):
-    model = NameServer
+    nullable_fields = (
+        "description",
+        "tenant",
+    )
 
     description = forms.CharField(
         max_length=200,
@@ -126,15 +173,3 @@ class NameServerBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Tenant"),
     )
-
-    fieldsets = (
-        FieldSet(
-            "description",
-            "tenant_group",
-            "tenant",
-            "tags",
-            name=_("Attributes"),
-        ),
-    )
-
-    nullable_fields = ("description", "tenant")