netbox-plugin-dns 0.21.4__py3-none-any.whl → 1.4.7__py3-none-any.whl

netbox_dns/forms/nameserver.py

@@ -1,4 +1,5 @@
 from django import forms
+from django.utils.translation import gettext_lazy as _
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -11,15 +12,53 @@ from utilities.forms.fields import (
     TagFilterField,
     CSVModelChoiceField,
     DynamicModelChoiceField,
+    DynamicModelMultipleChoiceField,
 )
-from tenancy.models import Tenant
+from utilities.forms.rendering import FieldSet
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
-from netbox_dns.models import NameServer
+from netbox_dns.models import NameServer, Zone
 from netbox_dns.utilities import name_to_unicode
 
 
+__all__ = (
+    "NameServerForm",
+    "NameServerFilterForm",
+    "NameServerImportForm",
+    "NameServerBulkEditForm",
+)
+
+
 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)
 
@@ -27,40 +66,59 @@ class NameServerForm(TenancyForm, NetBoxModelForm):
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
 
-    fieldsets = (
-        ("Nameserver", ("name", "description", "tags")),
-        ("Tenancy", ("tenant_group", "tenant")),
+    name = forms.CharField(
+        required=True,
+        label=_("Name"),
     )
 
-    class Meta:
-        model = NameServer
-        fields = ("name", "description", "tags", "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",
+        label=_("Name"),
     )
-    tag = TagFilterField(NameServer)
-
-    fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("name",)),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+    zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("Zones"),
     )
-
-
-class NameServerImportForm(NetBoxModelImportForm):
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        to_field_name="name",
+    soa_zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        null_option=_("None"),
+        label=_("SOA Zones"),
+    )
+    description = forms.CharField(
         required=False,
-        help_text="Assigned tenant",
+        label=_("Description"),
     )
+    tag = TagFilterField(NameServer)
 
+
+class NameServerImportForm(NetBoxModelImportForm):
     class Meta:
         model = NameServer
 
@@ -68,14 +126,50 @@ class NameServerImportForm(NetBoxModelImportForm):
             "name",
             "description",
             "tenant",
+            "tags",
         )
 
+    name = forms.CharField(
+        label=_("Name"),
+    )
+    tenant = CSVModelChoiceField(
+        queryset=Tenant.objects.all(),
+        to_field_name="name",
+        required=False,
+        label=_("Tenant"),
+    )
+
 
 class NameServerBulkEditForm(NetBoxModelBulkEditForm):
     model = NameServer
 
-    description = forms.CharField(max_length=200, required=False)
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
+    fieldsets = (
+        FieldSet(
+            "description",
+            "tenant_group",
+            "tenant",
+            "tags",
+            name=_("Attributes"),
+        ),
+    )
 
-    class Meta:
-        nullable_fields = ("description", "tenant")
+    nullable_fields = (
+        "description",
+        "tenant",
+    )
+
+    description = forms.CharField(
+        max_length=200,
+        required=False,
+        label=_("Description"),
+    )
+    tenant_group = DynamicModelChoiceField(
+        queryset=TenantGroup.objects.all(),
+        required=False,
+        label=_("Tenant Group"),
+    )
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        label=_("Tenant"),
+    )

netbox_dns/forms/record.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -14,50 +14,27 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     DynamicModelChoiceField,
 )
-from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
-from utilities.forms import add_blank_choice
-from tenancy.models import Tenant
+from utilities.forms.widgets import BulkEditNullBooleanSelect
+from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, add_blank_choice
+from utilities.forms.rendering import FieldSet
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
-from netbox_dns.models import View, Zone, Record, RecordTypeChoices, RecordStatusChoices
+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
 
 
-class RecordForm(TenancyForm, NetBoxModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        initial_name = self.initial.get("name")
-        if initial_name:
-            self.initial["name"] = name_to_unicode(initial_name)
-
-    disable_ptr = forms.BooleanField(
-        label="Disable PTR",
-        required=False,
-    )
-    ttl = forms.IntegerField(
-        required=False,
-        label="TTL",
-    )
+__all__ = (
+    "RecordForm",
+    "RecordFilterForm",
+    "RecordImportForm",
+    "RecordBulkEditForm",
+)
 
-    fieldsets = (
-        (
-            "Record",
-            (
-                "name",
-                "zone",
-                "type",
-                "value",
-                "status",
-                "ttl",
-                "disable_ptr",
-                "description",
-                "tags",
-            ),
-        ),
-        ("Tenancy", ("tenant_group", "tenant")),
-    )
 
+class RecordForm(TenancyForm, NetBoxModelForm):
     class Meta:
         model = Record
 
@@ -70,49 +47,178 @@ class RecordForm(TenancyForm, NetBoxModelForm):
             "ttl",
             "disable_ptr",
             "description",
-            "tags",
+            "tenant_group",
             "tenant",
+            "tags",
         )
 
+        labels = {
+            "disable_ptr": _("Disable PTR"),
+            "ttl": _("TTL"),
+        }
+
+    fieldsets = (
+        FieldSet(
+            "name",
+            "view",
+            "zone",
+            "type",
+            "value",
+            "status",
+            "ttl",
+            "disable_ptr",
+            "description",
+            name=_("Record"),
+        ),
+        FieldSet(
+            "tenant_group",
+            "tenant",
+            name=_("Tenancy"),
+        ),
+        FieldSet(
+            "tags",
+            name=_("Tags"),
+        ),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        initial_name = self.initial.get("name")
+        if initial_name:
+            self.initial["name"] = name_to_unicode(initial_name)
+
+    view = DynamicModelChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        initial_params={
+            "zones": "$zone",
+        },
+        label=_("View"),
+    )
+    zone = DynamicModelChoiceField(
+        queryset=Zone.objects.all(),
+        required=True,
+        query_params={
+            "view_id": "$view",
+        },
+        label=_("Zone"),
+    )
+    type = forms.ChoiceField(
+        choices=add_blank_choice(RecordSelectableTypeChoices),
+        required=True,
+        label=_("Type"),
+    )
+
 
 class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Record
+
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("view_id", "zone_id", "name", "value", "status")),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet(
+            "q",
+            "filter_id",
+            "tag",
+        ),
+        FieldSet(
+            "name",
+            "view_id",
+            "zone_id",
+            "fqdn",
+            "type",
+            "value",
+            "status",
+            "ttl",
+            "disable_ptr",
+            "description",
+            "active",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "tenant_group_id",
+            "tenant_id",
+            name=_("Tenancy"),
+        ),
     )
 
     type = forms.MultipleChoiceField(
-        choices=add_blank_choice(RecordTypeChoices),
+        choices=RecordSelectableTypeChoices,
         required=False,
+        label=_("Type"),
     )
     name = forms.CharField(
         required=False,
-        label="Name",
+        label=_("Name"),
+    )
+    fqdn = forms.CharField(
+        required=False,
+        label=_("FQDN"),
     )
     value = forms.CharField(
         required=False,
-        label="Value",
+        label=_("Value"),
     )
-    status = forms.ChoiceField(
-        choices=add_blank_choice(RecordStatusChoices),
+    disable_ptr = forms.NullBooleanField(
         required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Disable PTR"),
     )
-    zone_id = DynamicModelMultipleChoiceField(
-        queryset=Zone.objects.all(),
+    status = forms.MultipleChoiceField(
+        choices=RecordStatusChoices,
+        required=False,
+        label=_("Status"),
+    )
+    ttl = TimePeriodField(
         required=False,
-        label="Zone",
+        label=_("TTL"),
     )
     view_id = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label="View",
+        label=_("View"),
+    )
+    zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        label=_("Zone"),
+        query_params={
+            "view_id": "$view_id",
+        },
+    )
+    active = forms.NullBooleanField(
+        required=False,
+        widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Active"),
+    )
+    description = forms.CharField(
+        required=False,
+        label=_("Description"),
     )
     tag = TagFilterField(Record)
 
 
 class RecordImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = Record
+
+        fields = (
+            "zone",
+            "view",
+            "type",
+            "name",
+            "value",
+            "ttl",
+            "disable_ptr",
+            "description",
+            "tenant",
+            "tags",
+        )
+
+        labels = {
+            "disable_ptr": _("Disable PTR"),
+            "ttl": _("TTL"),
+        }
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -123,47 +229,45 @@ class RecordImportForm(NetBoxModelImportForm):
             except forms.ValidationError:
                 pass
 
-        if view:
-            self.fields["zone"].queryset = Zone.objects.filter(view=view)
+        if view is not None:
+            self.fields["zone"].queryset = view.zones
         else:
-            self.fields["zone"].queryset = Zone.objects.filter(view__isnull=True)
+            self.fields["zone"].queryset = View.get_default_view().zones
 
     zone = CSVModelChoiceField(
         queryset=Zone.objects.all(),
         to_field_name="name",
         required=True,
-        help_text="Zone",
+        label=_("Zone"),
+        error_messages={
+            "invalid_choice": _("Zone %(value)s not found"),
+        },
     )
     view = CSVModelChoiceField(
         queryset=View.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="View the zone belongs to",
+        label=_("View"),
+        error_messages={
+            "invalid_choice": _("View %(value)s not found"),
+        },
+        help_text=_("This field is required if the zone is not in the default view"),
     )
     type = CSVChoiceField(
-        choices=RecordTypeChoices,
+        choices=RecordSelectableTypeChoices,
         required=True,
-        help_text="Record Type",
+        label=_("Type"),
     )
     status = CSVChoiceField(
         choices=RecordStatusChoices,
         required=False,
-        help_text="Record status",
-    )
-    ttl = forms.IntegerField(
-        required=False,
-        help_text="TTL",
-    )
-    disable_ptr = forms.BooleanField(
-        required=False,
-        label="Disable PTR",
-        help_text="Disable generation of a PTR record",
+        label=_("Status"),
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
 
     def is_valid(self):
@@ -174,67 +278,74 @@ class RecordImportForm(NetBoxModelImportForm):
 
         return is_valid
 
-    class Meta:
-        model = Record
 
-        fields = (
+class RecordBulkEditForm(NetBoxModelBulkEditForm):
+    model = Record
+
+    fieldsets = (
+        FieldSet(
             "zone",
-            "view",
             "type",
-            "name",
             "value",
+            "status",
             "ttl",
             "disable_ptr",
             "description",
+            name=_("Attributes"),
+        ),
+        FieldSet(
+            "tenant_group",
             "tenant",
-        )
-
+            name=_("Tenancy"),
+        ),
+    )
 
-class RecordBulkEditForm(NetBoxModelBulkEditForm):
-    model = Record
+    nullable_fields = (
+        "description",
+        "ttl",
+        "tenant",
+    )
 
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
         required=False,
-        widget=APISelect(
-            attrs={"data-url": reverse_lazy("plugins-api:netbox_dns-api:zone-list")}
-        ),
+        label=_("Zone"),
     )
     type = forms.ChoiceField(
-        choices=add_blank_choice(RecordTypeChoices),
+        choices=add_blank_choice(RecordSelectableTypeChoices),
         required=False,
+        label=_("Type"),
     )
     value = forms.CharField(
         required=False,
-        label="Value",
+        label=_("Value"),
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(RecordStatusChoices),
         required=False,
+        label=_("Status"),
     )
-    ttl = forms.IntegerField(
+    ttl = TimePeriodField(
         required=False,
-        label="TTL",
+        label=_("TTL"),
     )
     disable_ptr = forms.NullBooleanField(
-        required=False, widget=BulkEditNullBooleanSelect(), label="Disable PTR"
+        required=False,
+        widget=BulkEditNullBooleanSelect(),
+        label=_("Disable PTR"),
     )
-    description = forms.CharField(max_length=200, required=False)
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
-
-    fieldsets = (
-        (
-            None,
-            (
-                "zone",
-                "type",
-                "value",
-                "status",
-                "ttl",
-                "disable_ptr",
-                "description",
-                "tenant",
-            ),
-        ),
+    description = forms.CharField(
+        max_length=200,
+        required=False,
+        label=_("Description"),
+    )
+    tenant_group = DynamicModelChoiceField(
+        queryset=TenantGroup.objects.all(),
+        required=False,
+        label=_("Tenant Group"),
+    )
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+        label=_("Tenant"),
     )
-    nullable_fields = ("description", "ttl", "tenant")