netbox-plugin-dns 1.2.7b3__py3-none-any.whl → 1.3b1__py3-none-any.whl

netbox_dns/filtersets/zone.py

@@ -16,7 +16,7 @@ from netbox_dns.models import (
     NameServer,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
 
 
 __all__ = ("ZoneFilterSet",)
@@ -86,7 +86,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
-        label="Registrar ID",
+        label=_("Registrar ID"),
     )
     registrar = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
@@ -94,6 +94,10 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("Registrar"),
     )
+    expiration_date = django_filters.DateFromToRangeFilter()
+    domain_status = django_filters.MultipleChoiceFilter(
+        choices=ZoneEPPStatusChoices,
+    )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         label=_("Registrant ID"),
@@ -160,6 +164,7 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
             "rfc2317_parent_managed",
             "inline_signing",
             "registry_domain_id",
+            "domain_status",
         )
 
     def filter_arpa_network(self, queryset, name, value):

netbox_dns/filtersets/zone_template.py

@@ -48,13 +48,13 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=NameServer.objects.all(),
         field_name="soa_mname",
         to_field_name="id",
-        label=_("SOA MNAME ID"),
+        label=_("SOA MName ID"),
     )
     soa_mname = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="soa_mname__name",
         to_field_name="name",
-        label=_("SOA MNAME"),
+        label=_("SOA MName"),
     )
     dnssec_policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DNSSECPolicy.objects.all(),

netbox_dns/forms/dnssec_key_template.py

@@ -68,7 +68,7 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet("name", "description", name=_("Attributes")),
-        FieldSet("policies_id", name=_("Policies")),
+        FieldSet("policiy_id", name=_("Policies")),
         FieldSet("type", "lifetime", "algorithm", "key_size", name=_("Key Properties")),
         FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
@@ -79,9 +79,10 @@ class DNSSECKeyTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     description = forms.CharField(
         required=False,
     )
-    policies_id = DynamicModelMultipleChoiceField(
+    policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Policies"),
     )
     type = forms.MultipleChoiceField(

netbox_dns/forms/dnssec_policy.py

@@ -186,12 +186,12 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "name",
             "description",
             "status",
-            "key_templates_id",
+            "key_template_id",
             name=_("Attributes"),
         ),
         FieldSet(
-            "zones_id",
-            "zone_templates_id",
+            "zone_id",
+            "zone_template_id",
             name=_("Assignments"),
         ),
         FieldSet(
@@ -236,19 +236,22 @@ class DNSSECPolicyFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_("Status"),
     )
-    key_templates_id = DynamicModelMultipleChoiceField(
+    key_template_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECKeyTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Key Templates"),
     )
-    zones_id = DynamicModelMultipleChoiceField(
+    zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zones"),
     )
-    zone_templates_id = DynamicModelMultipleChoiceField(
+    zone_template_id = DynamicModelMultipleChoiceField(
         queryset=ZoneTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zone Templates"),
     )
     dnskey_ttl = TimePeriodField(

netbox_dns/forms/nameserver.py

@@ -64,11 +64,13 @@ class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zones"),
     )
     soa_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("SOA Zones"),
     )
     description = forms.CharField(

netbox_dns/forms/record_template.py

@@ -146,6 +146,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     zone_template_id = DynamicModelMultipleChoiceField(
         queryset=ZoneTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Zone Templates"),
     )
     tag = TagFilterField(RecordTemplate)

netbox_dns/forms/zone.py

@@ -23,7 +23,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
 )
 from utilities.release import load_release_data
-from utilities.forms.widgets import BulkEditNullBooleanSelect
+from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker
 from utilities.forms.rendering import FieldSet
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
 from tenancy.models import Tenant, TenantGroup
@@ -38,7 +38,7 @@ from netbox_dns.models import (
     ZoneTemplate,
     DNSSECPolicy,
 )
-from netbox_dns.choices import ZoneStatusChoices
+from netbox_dns.choices import ZoneStatusChoices, ZoneEPPStatusChoices
 from netbox_dns.utilities import name_to_unicode, network_to_reverse
 from netbox_dns.fields import RFC2317NetworkFormField, TimePeriodField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
@@ -59,10 +59,21 @@ class RollbackTransaction(Exception):
 
 
 class ZoneTemplateUpdateMixin:
+    def _check_soa_mname(self):
+        if (
+            self.cleaned_data.get("soa_mname") is None
+            and "soa_mname" in self.fields.keys()
+        ):
+            self.add_error(
+                "soa_mname",
+                _("soa_mname not set and no template or default value defined"),
+            )
+
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
 
         if (template := self.cleaned_data.get("template")) is None:
+            self._check_soa_mname()
             return
 
         if not self.cleaned_data.get("nameservers") and template.nameservers.all():
@@ -77,11 +88,7 @@ class ZoneTemplateUpdateMixin:
             ) not in (None, ""):
                 self.cleaned_data[field] = getattr(template, field)
 
-        if self.cleaned_data.get("soa_mname") is None:
-            self.add_error(
-                "soa_mname",
-                _("soa_mname not set and no template or default value defined"),
-            )
+        self._check_soa_mname()
 
         if self.errors:
             return
@@ -285,6 +292,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -379,6 +388,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "inline_signing",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -387,8 +398,8 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             "tenant",
             "tags",
         )
-        help_texts = {
-            "soa_mname": _("Primary nameserver for the zone"),
+        widgets = {
+            "expiration_date": DatePicker,
         }
 
 
@@ -412,7 +423,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             name=_("SOA"),
         ),
         FieldSet(
-            "dnssec_policy",
+            "dnssec_policy_id",
             "inline_signing",
             name=_("DNSSEC"),
         ),
@@ -425,6 +436,9 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         FieldSet(
             "registrar_id",
             "registry_domain_id",
+            "expiration_date_before",
+            "expiration_date_after",
+            "domain_status",
             "registrant_id",
             "admin_c_id",
             "tech_c_id",
@@ -451,6 +465,7 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     active = forms.NullBooleanField(
@@ -488,40 +503,67 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     rfc2317_parent_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Parent Zone"),
     )
-    registrar_id = DynamicModelMultipleChoiceField(
-        queryset=Registrar.objects.all(),
-        required=False,
-        label=_("Registrar"),
-    )
     dnssec_policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("DNSSEC Policy"),
     )
+    inline_signing = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Use Inline Signing"),
+    )
+    registrar_id = DynamicModelMultipleChoiceField(
+        queryset=Registrar.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Registrar"),
+    )
     registry_domain_id = forms.CharField(
         required=False,
         label=_("Registry Domain ID"),
     )
+    expiration_date_after = forms.DateField(
+        required=False,
+        label=_("Expiration Date after"),
+        widget=DatePicker,
+    )
+    expiration_date_before = forms.DateField(
+        required=False,
+        label=_("Expiration Date before"),
+        widget=DatePicker,
+    )
+    domain_status = forms.MultipleChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrant"),
     )
     admin_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Administrative Contact"),
     )
     tech_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Technical Contact"),
     )
     billing_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Billing Contact"),
     )
     tag = TagFilterField(Zone)
@@ -638,6 +680,11 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         required=False,
         label=_("Registry Domain ID"),
     )
+    domain_status = CSVChoiceField(
+        choices=ZoneEPPStatusChoices,
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant = CSVModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
@@ -713,6 +760,8 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
             "rfc2317_parent_managed",
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -846,6 +895,16 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_("Registry Domain ID"),
     )
+    expiration_date = forms.DateField(
+        required=False,
+        label=_("Expiration Date"),
+        widget=DatePicker,
+    )
+    domain_status = forms.ChoiceField(
+        choices=add_blank_choice(ZoneEPPStatusChoices),
+        required=False,
+        label=_("Domain Status"),
+    )
     registrant = DynamicModelChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
@@ -913,6 +972,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         FieldSet(
             "registrar",
             "registry_domain_id",
+            "expiration_date",
+            "domain_status",
             "registrant",
             "admin_c",
             "tech_c",
@@ -927,6 +988,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "nameservers",
         "rfc2317_prefix",
         "registrar",
+        "expiration_date",
+        "domain_status",
         "registry_domain_id",
         "registrant",
         "admin_c",

netbox_dns/forms/zone_template.py

@@ -127,11 +127,13 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     nameserver_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Nameservers"),
     )
     soa_mname_id = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("MName"),
     )
     soa_rname = forms.CharField(
@@ -141,6 +143,7 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     record_template_id = DynamicModelMultipleChoiceField(
         queryset=RecordTemplate.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Record Templates"),
     )
     description = forms.CharField(
@@ -149,31 +152,37 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     dnssec_policy_id = DynamicModelMultipleChoiceField(
         queryset=DNSSECPolicy.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("DNSSEC Policy ID"),
     )
     registrar_id = DynamicModelMultipleChoiceField(
         queryset=Registrar.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrar"),
     )
     registrant_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Registrant"),
     )
     admin_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Administrative Contact"),
     )
     tech_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Technical Contact"),
     )
     billing_c_id = DynamicModelMultipleChoiceField(
         queryset=RegistrationContact.objects.all(),
         required=False,
+        null_option=_("None"),
         label=_("Billing Contact"),
     )
     tag = TagFilterField(ZoneTemplate)

netbox_dns/graphql/enums.py

@@ -0,0 +1,41 @@
+import strawberry
+
+from netbox_dns.choices import (
+    RecordTypeChoices,
+    RecordClassChoices,
+    RecordStatusChoices,
+    ZoneStatusChoices,
+    DNSSECPolicyDigestChoices,
+    DNSSECPolicyStatusChoices,
+    DNSSECKeyTemplateTypeChoices,
+    DNSSECKeyTemplateAlgorithmChoices,
+    DNSSECKeyTemplateKeySizeChoices,
+)
+
+__all__ = (
+    "NetBoxDNSRecordTypeEnum",
+    "NetBoxDNSRecordClassEnum",
+    "NetBoxDNSRecordStatusEnum",
+    "NetBoxDNSZoneStatusEnum",
+    "NetBoxDNSDNSSECPolicyDigestEnum",
+    "NetBoxDNSDNSSECPolicyStatusEnum",
+    "NetBoxDNSDNSSECKeyTemplateTypeEnum",
+    "NetBoxDNSDNSSECKeyTemplateAlgorithmEnum",
+    "NetBoxDNSDNSSECKeyTemplateKeySizeEnum",
+)
+
+NetBoxDNSRecordTypeEnum = strawberry.enum(RecordTypeChoices.as_enum())
+NetBoxDNSRecordClassEnum = strawberry.enum(RecordClassChoices.as_enum())
+NetBoxDNSRecordStatusEnum = strawberry.enum(RecordStatusChoices.as_enum())
+NetBoxDNSZoneStatusEnum = strawberry.enum(ZoneStatusChoices.as_enum())
+NetBoxDNSDNSSECPolicyDigestEnum = strawberry.enum(DNSSECPolicyDigestChoices.as_enum())
+NetBoxDNSDNSSECPolicyStatusEnum = strawberry.enum(DNSSECPolicyStatusChoices.as_enum())
+NetBoxDNSDNSSECKeyTemplateTypeEnum = strawberry.enum(
+    DNSSECKeyTemplateTypeChoices.as_enum()
+)
+NetBoxDNSDNSSECKeyTemplateAlgorithmEnum = strawberry.enum(
+    DNSSECKeyTemplateAlgorithmChoices.as_enum()
+)
+NetBoxDNSDNSSECKeyTemplateKeySizeEnum = strawberry.enum(
+    DNSSECKeyTemplateKeySizeChoices.as_enum()
+)

netbox_dns/graphql/filter_lookups.py

@@ -0,0 +1,13 @@
+import strawberry
+
+from netbox.graphql.filter_lookups import ArrayLookup
+
+from netbox_dns.graphql.enums import NetBoxDNSDNSSECPolicyDigestEnum
+
+
+@strawberry.input(
+    one_of=True,
+    description="Lookup for Array fields. Only one of the lookup fields can be set.",
+)
+class PolicyDigestArrayLookup(ArrayLookup[NetBoxDNSDNSSECPolicyDigestEnum]):
+    pass

netbox_dns/graphql/filters/__init__.py

@@ -0,0 +1,12 @@
+from .view import *
+from .zone import *
+from .nameserver import *
+from .record import *
+from .registration_contact import *
+from .registrar import *
+
+from .zone_template import *
+from .record_template import *
+
+from .dnssec_key_template import *
+from .dnssec_policy import *

netbox_dns/graphql/filters/dnssec_key_template.py

@@ -0,0 +1,63 @@
+from typing import Annotated, TYPE_CHECKING
+
+import strawberry
+import strawberry_django
+from strawberry.scalars import ID
+from strawberry_django import FilterLookup
+
+from netbox.graphql.filter_mixins import NetBoxModelFilterMixin
+from tenancy.graphql.filter_mixins import ContactFilterMixin, TenancyFilterMixin
+
+if TYPE_CHECKING:
+    from netbox.graphql.filter_lookups import IntegerLookup
+    from .enums import (
+        NetBoxDNSDNSSECKeyTemplateTypeEnum,
+        NetBoxDNSDNSSECKeyTemplateAlgorithmEnum,
+        NetBoxDNSDNSSECKeyTemplateKeySizeEnum,
+    )
+    from .dnssec_policy import NetBoxDNSDNSSECPolicyFilter
+
+from netbox_dns.models import DNSSECKeyTemplate
+
+
+__all__ = ("NetBoxDNSDNSSECKeyTemplateFilter",)
+
+
+@strawberry_django.filter(DNSSECKeyTemplate, lookups=True)
+class NetBoxDNSDNSSECKeyTemplateFilter(
+    ContactFilterMixin, TenancyFilterMixin, NetBoxModelFilterMixin
+):
+    name: FilterLookup[str] | None = strawberry_django.filter_field()
+    description: FilterLookup[str] | None = strawberry_django.filter_field()
+    type: (
+        Annotated[
+            "NetBoxDNSDNSSECKeyTemplateTypeEnum",
+            strawberry.lazy("netbox_dns.graphql.enums"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    algorithm: (
+        Annotated[
+            "NetBoxDNSDNSSECKeyTemplateAlgorithmEnum",
+            strawberry.lazy("netbox_dns.graphql.enums"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    lifetime: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
+    key_size: (
+        Annotated[
+            "NetBoxDNSDNSSECKeyTemplateKeySizeEnum",
+            strawberry.lazy("netbox_dns.graphql.enums"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    policy: (
+        Annotated[
+            "NetBoxDNSDNSSECPolicyFilter", strawberry.lazy("netbox_dns.graphql.filters")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    policy_id: ID | None = strawberry_django.filter_field()