PyPI - netbox-plugin-dns - Versions diffs - 1.3b1__py3-none-any.whl → 1.3.1__py3-none-any.whl - Mend

netbox-plugin-dns 1.3b1py3-none-any.whl → 1.3.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of netbox-plugin-dns might be problematic. Click here for more details.

Files changed (73) hide show

netbox_dns/__init__.py +3 -2
netbox_dns/api/nested_serializers.py +54 -49
netbox_dns/api/serializers_/dnssec_key_template.py +22 -13
netbox_dns/api/serializers_/dnssec_policy.py +89 -40
netbox_dns/api/serializers_/nameserver.py +25 -13
netbox_dns/api/serializers_/record.py +46 -38
netbox_dns/api/serializers_/record_template.py +21 -12
netbox_dns/api/serializers_/registrar.py +14 -5
netbox_dns/api/serializers_/registration_contact.py +13 -5
netbox_dns/api/serializers_/view.py +28 -19
netbox_dns/api/serializers_/zone.py +87 -62
netbox_dns/api/serializers_/zone_template.py +40 -34
netbox_dns/choices/dnssec_key_template.py +4 -0
netbox_dns/choices/record.py +4 -2
netbox_dns/filtersets/dnssec_key_template.py +10 -4
netbox_dns/filtersets/dnssec_policy.py +2 -0
netbox_dns/filtersets/nameserver.py +9 -4
netbox_dns/filtersets/record.py +16 -15
netbox_dns/filtersets/record_template.py +13 -12
netbox_dns/filtersets/registrar.py +1 -0
netbox_dns/filtersets/registration_contact.py +1 -0
netbox_dns/filtersets/view.py +10 -4
netbox_dns/filtersets/zone.py +39 -20
netbox_dns/filtersets/zone_template.py +10 -9
netbox_dns/forms/dnssec_key_template.py +97 -46
netbox_dns/forms/dnssec_policy.py +124 -105
netbox_dns/forms/nameserver.py +71 -36
netbox_dns/forms/record.py +96 -78
netbox_dns/forms/record_template.py +87 -59
netbox_dns/forms/registrar.py +55 -39
netbox_dns/forms/registration_contact.py +64 -41
netbox_dns/forms/view.py +98 -51
netbox_dns/forms/zone.py +273 -243
netbox_dns/forms/zone_template.py +151 -101
netbox_dns/graphql/types.py +3 -3
netbox_dns/locale/de/LC_MESSAGES/django.mo +0 -0
netbox_dns/locale/fr/LC_MESSAGES/django.mo +0 -0
netbox_dns/migrations/0019_dnssecpolicy_parental_agents.py +25 -0
netbox_dns/migrations/0020_remove_dnssecpolicy_parental_agents_and_more.py +29 -0
netbox_dns/migrations/0021_alter_record_ptr_record.py +25 -0
netbox_dns/models/dnssec_key_template.py +24 -22
netbox_dns/models/dnssec_policy.py +17 -16
netbox_dns/models/nameserver.py +26 -25
netbox_dns/models/record.py +117 -61
netbox_dns/models/record_template.py +30 -29
netbox_dns/models/registrar.py +13 -12
netbox_dns/models/registration_contact.py +33 -32
netbox_dns/models/view.py +16 -15
netbox_dns/models/zone.py +88 -57
netbox_dns/models/zone_template.py +35 -34
netbox_dns/tables/dnssec_key_template.py +13 -12
netbox_dns/tables/dnssec_policy.py +18 -15
netbox_dns/tables/nameserver.py +10 -8
netbox_dns/tables/record.py +55 -34
netbox_dns/tables/record_template.py +21 -17
netbox_dns/tables/registrar.py +15 -9
netbox_dns/tables/registration_contact.py +15 -9
netbox_dns/tables/view.py +25 -12
netbox_dns/tables/zone.py +23 -21
netbox_dns/tables/zone_template.py +17 -13
netbox_dns/template_content.py +13 -2
netbox_dns/templates/netbox_dns/record.html +13 -11
netbox_dns/templates/netbox_dns/zone.html +10 -0
netbox_dns/validators/dns_name.py +1 -1
netbox_dns/views/dnssec_key_template.py +3 -3
netbox_dns/views/record.py +19 -3
netbox_dns/views/record_template.py +3 -1
netbox_dns/views/zone_template.py +5 -3
{netbox_plugin_dns-1.3b1.dist-info → netbox_plugin_dns-1.3.1.dist-info}/METADATA +3 -2
{netbox_plugin_dns-1.3b1.dist-info → netbox_plugin_dns-1.3.1.dist-info}/RECORD +73 -70
{netbox_plugin_dns-1.3b1.dist-info → netbox_plugin_dns-1.3.1.dist-info}/WHEEL +1 -1
{netbox_plugin_dns-1.3b1.dist-info → netbox_plugin_dns-1.3.1.dist-info}/licenses/LICENSE +0 -0
{netbox_plugin_dns-1.3b1.dist-info → netbox_plugin_dns-1.3.1.dist-info}/top_level.txt +0 -0

netbox_dns/forms/dnssec_key_template.py CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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,19 +32,16 @@ __all__ = (
     "DNSSECPolicyBulkEditForm",
 )
-QUICK_ADD = Version(load_release_data().version) >= Version("4.2.5")
 class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
-    fieldsets = (
-        FieldSet(
+    class Meta:
+        model = DNSSECPolicy
+        fields = (
             "name",
             "description",
             "status",
             "key_templates",
-            name=_("Attributes"),
-        ),
-        FieldSet(
             "dnskey_ttl",
             "purge_keys",
             "publish_safety",
@@ -58,41 +52,28 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "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")),
-        FieldSet("tags", name=_("Tags")),
-    )
-    key_templates = DynamicModelMultipleChoiceField(
-        queryset=DNSSECKeyTemplate.objects.all(),
-        required=False,
-        label=_("Key Templates"),
-        help_text=_("Select CSK or KSK/ZSK templates for signing"),
-        quick_add=QUICK_ADD,
-    )
+            "tenant_group",
+            "tenant",
+            "tags",
+        )
-    class Meta:
-        model = DNSSECPolicy
-        fields = (
+    fieldsets = (
+        FieldSet(
             "name",
             "description",
             "status",
             "key_templates",
+            name=_("Attributes"),
+        ),
+        FieldSet(
             "dnskey_ttl",
             "purge_keys",
             "publish_safety",
@@ -103,19 +84,40 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
             "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"),
+        ),
+        FieldSet(
             "tags",
-        )
+            name=_("Tags"),
+        ),
+    )
+    key_templates = DynamicModelMultipleChoiceField(
+        queryset=DNSSECKeyTemplate.objects.all(),
+        required=False,
+        label=_("Key Templates"),
+        help_text=_("Select CSK or KSK/ZSK templates for signing"),
+        quick_add=True,
+    )
     dnskey_ttl = TimePeriodField(
         required=False,
         label=_("DNSKEY TTL"),
@@ -180,8 +182,13 @@ class DNSSECPolicyForm(TenancyForm, NetBoxModelForm):
 class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = DNSSECPolicy
     fieldsets = (
-        FieldSet("q", "filter_id", "tag"),
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
         FieldSet(
             "name",
             "description",
@@ -221,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(
@@ -335,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,
@@ -395,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",
@@ -411,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,
@@ -524,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 CHANGED Viewed

@@ -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")

netbox-plugin-dns 1.3b1__py3-none-any.whl → 1.3.1__py3-none-any.whl

Potentially problematic release.

netbox-plugin-dns 1.3b1py3-none-any.whl → 1.3.1py3-none-any.whl