netbox-plugin-dns 0.22.9__py3-none-any.whl → 1.0.0__py3-none-any.whl

netbox_dns/forms/registrar.py

@@ -7,6 +7,7 @@ from netbox.forms import (
     NetBoxModelForm,
 )
 from utilities.forms.fields import TagFilterField
+from utilities.forms.rendering import FieldSet
 
 from netbox_dns.models import Registrar
 
@@ -14,9 +15,24 @@ from netbox_dns.models import Registrar
 class RegistrarForm(NetBoxModelForm):
     class Meta:
         model = Registrar
+        fieldsets = (
+            FieldSet(
+                "name",
+                "iana_id",
+                "description",
+                "address",
+                "referral_url",
+                "whois_server",
+                "abuse_email",
+                "abuse_phone",
+                name="Registrar",
+            ),
+            FieldSet("tags", name="Tags"),
+        )
         fields = (
             "name",
             "iana_id",
+            "description",
             "address",
             "referral_url",
             "whois_server",
@@ -29,10 +45,15 @@ class RegistrarForm(NetBoxModelForm):
 class RegistrarFilterForm(NetBoxModelFilterSetForm):
     model = Registrar
     fieldsets = (
-        (None, ("q", "name", "iana_id", "tags")),
-        (
-            "Contact",
-            ("address", "referral_url", "whois_server", "abuse_email", "abuse_phone"),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "iana_id", "description", name="Attributes"),
+        FieldSet(
+            "address",
+            "referral_url",
+            "whois_server",
+            "abuse_email",
+            "abuse_phone",
+            name="Contact",
         ),
     )
 
@@ -42,6 +63,9 @@ class RegistrarFilterForm(NetBoxModelFilterSetForm):
     address = forms.CharField(
         required=False,
     )
+    description = forms.CharField(
+        required=False,
+    )
     iana_id = forms.IntegerField(
         required=False,
         label="IANA ID",
@@ -62,7 +86,7 @@ class RegistrarFilterForm(NetBoxModelFilterSetForm):
         required=False,
         label="Abuse Phone",
     )
-    tags = TagFilterField(Registrar)
+    tag = TagFilterField(Registrar)
 
 
 class RegistrarImportForm(NetBoxModelImportForm):
@@ -71,6 +95,7 @@ class RegistrarImportForm(NetBoxModelImportForm):
         fields = (
             "name",
             "iana_id",
+            "description",
             "address",
             "referral_url",
             "whois_server",
@@ -87,8 +112,13 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label="IANA ID",
     )
+    description = forms.CharField(
+        required=False,
+        label="Description",
+    )
     address = forms.CharField(
         required=False,
+        label="Address",
     )
     referral_url = forms.CharField(
         required=False,
@@ -108,21 +138,21 @@ class RegistrarBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     fieldsets = (
-        (
-            None,
-            (
-                "iana_id",
-                "address",
-                "referral_url",
-                "whois_server",
-                "abuse_email",
-                "abuse_phone",
-            ),
+        FieldSet(
+            "iana_id",
+            "description",
+            "address",
+            "referral_url",
+            "whois_server",
+            "abuse_email",
+            "abuse_phone",
+            name="Attributes",
         ),
     )
 
     nullable_fields = (
         "iana_id",
+        "description",
         "address",
         "referral_url",
         "whois_server",

netbox_dns/forms/view.py

@@ -11,6 +11,7 @@ from utilities.forms.fields import (
     CSVModelChoiceField,
     DynamicModelChoiceField,
 )
+from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
@@ -19,26 +20,31 @@ from netbox_dns.models import View
 
 class ViewForm(TenancyForm, NetBoxModelForm):
     fieldsets = (
-        ("View", ("name", "description", "tags")),
-        ("Tenancy", ("tenant_group", "tenant")),
+        FieldSet("name", "default_view", "description", "tags", name="View"),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
     )
 
     class Meta:
         model = View
-        fields = ("name", "description", "tags", "tenant")
+        fields = ("name", "default_view", "description", "tags", "tenant")
 
 
 class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = View
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("name",)),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet("name", "default_view", "description", name="Attributes"),
+        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
     name = forms.CharField(
         required=False,
-        label="Name",
+    )
+    default_view = forms.NullBooleanField(
+        required=False,
+    )
+    description = forms.CharField(
+        required=False,
     )
     tag = TagFilterField(View)
 
@@ -62,5 +68,13 @@ class ViewBulkEditForm(NetBoxModelBulkEditForm):
     description = forms.CharField(max_length=200, required=False)
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
 
-    class Meta:
-        nullable_fields = ("description", "tenant")
+    fieldsets = (
+        FieldSet(
+            "name",
+            "description",
+            name="Attributes",
+        ),
+        FieldSet("tenant", name="Tenancy"),
+    )
+
+    nullable_fields = ("description", "tenant")

netbox_dns/forms/zone.py

@@ -1,6 +1,5 @@
 from django import forms
 from django.conf import settings
-from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.urls import reverse_lazy
 
@@ -19,6 +18,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField,
 )
 from utilities.forms.widgets import BulkEditNullBooleanSelect, APISelect
+from utilities.forms.rendering import FieldSet
 from utilities.forms import add_blank_choice
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
@@ -55,7 +55,7 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
     )
     soa_rname = forms.CharField(
         required=True,
-        label="SOA Responsible",
+        label="SOA RName",
         help_text="Mailbox of the zone's administrator",
     )
     soa_serial_auto = forms.BooleanField(
@@ -106,67 +106,56 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
     )
 
     fieldsets = (
-        (
-            "Zone",
-            (
-                "view",
-                "name",
-                "status",
-                "nameservers",
-                "default_ttl",
-                "description",
-            ),
+        FieldSet(
+            "view",
+            "name",
+            "status",
+            "nameservers",
+            "default_ttl",
+            "description",
+            name="Zone",
         ),
-        (
-            "SOA",
-            (
-                "soa_ttl",
-                "soa_mname",
-                "soa_rname",
-                "soa_refresh",
-                "soa_retry",
-                "soa_expire",
-                "soa_minimum",
-                "soa_serial_auto",
-                "soa_serial",
-            ),
+        FieldSet(
+            "soa_ttl",
+            "soa_mname",
+            "soa_rname",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "soa_serial_auto",
+            "soa_serial",
+            name="SOA",
         ),
-        (
-            "RFC2317",
-            (
-                "rfc2317_prefix",
-                "rfc2317_parent_managed",
-            ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            name="RFC 2317",
         ),
-        (
-            "Domain Registration",
-            (
-                "registrar",
-                "registry_domain_id",
-                "registrant",
-                "admin_c",
-                "tech_c",
-                "billing_c",
-            ),
+        FieldSet(
+            "registrar",
+            "registry_domain_id",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            name="Domain Registration",
         ),
-        ("Tags", ("tags",)),
-        ("Tenancy", ("tenant_group", "tenant")),
+        FieldSet("tags", name="Tags"),
+        FieldSet("tenant", name="Tenancy"),
     )
 
     def __init__(self, *args, **kwargs):
-        """Override the __init__ method in order to provide the initial value for the default fields"""
         super().__init__(*args, **kwargs)
 
         initial_name = self.initial.get("name")
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
 
-        defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
-
-        def _initialize(initial, setting):
-            if initial.get(setting, None) in (None, ""):
-                initial[setting] = defaults.get(f"zone_{setting}", None)
+        if self.initial.get("view") is None:
+            self.initial["view"] = View.get_default_view()
 
+        defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
         for setting in (
             "default_ttl",
             "soa_ttl",
@@ -177,16 +166,17 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
             "soa_expire",
             "soa_minimum",
         ):
-            _initialize(self.initial, setting)
+            if self.initial.get(setting) in (None, ""):
+                self.initial[setting] = defaults.get(f"zone_{setting}")
 
-        if self.initial.get("soa_ttl", None) is None:
-            self.initial["soa_ttl"] = self.initial.get("default_ttl", None)
+        if self.initial.get("soa_ttl") is None:
+            self.initial["soa_ttl"] = self.initial.get("default_ttl")
 
         if self.initial.get("soa_serial_auto"):
             self.initial["soa_serial"] = None
 
-        if self.initial.get("soa_mname", None) in (None, ""):
-            default_soa_mname = defaults.get("zone_soa_mname", None)
+        if self.initial.get("soa_mname") is None:
+            default_soa_mname = defaults.get("zone_soa_mname")
             if default_soa_mname is not None:
                 try:
                     self.initial["soa_mname"] = NameServer.objects.get(
@@ -248,9 +238,32 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
 class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = Zone
     fieldsets = (
-        (None, ("q", "filter_id", "tag")),
-        ("Attributes", ("view_id", "status", "name", "nameservers")),
-        ("Tenant", ("tenant_group_id", "tenant_id")),
+        FieldSet("q", "filter_id", "tag"),
+        FieldSet(
+            "view_id", "status", "name", "nameservers", "description", name="Attributes"
+        ),
+        FieldSet(
+            "soa_mname_id",
+            "soa_rname",
+            "soa_serial_auto",
+            name="SOA",
+        ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            "rfc2317_parent_zone_id",
+            name="RFC2317",
+        ),
+        FieldSet(
+            "registrar_id",
+            "registry_domain_id",
+            "registrant_id",
+            "admin_c_id",
+            "tech_c_id",
+            "billing_c_id",
+            name="Registration",
+        ),
+        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
     view_id = DynamicModelMultipleChoiceField(
@@ -264,12 +277,69 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
     name = forms.CharField(
         required=False,
-        label="Name",
     )
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
     )
+    description = forms.CharField(
+        required=False,
+    )
+    soa_mname_id = DynamicModelMultipleChoiceField(
+        queryset=NameServer.objects.all(),
+        label="MName",
+        required=False,
+    )
+    soa_rname = forms.CharField(
+        required=False,
+        label="RName",
+    )
+    soa_serial_auto = forms.NullBooleanField(
+        required=False,
+        label="Generate Serial",
+    )
+    rfc2317_prefix = RFC2317NetworkFormField(
+        required=False,
+        label="Prefix",
+    )
+    rfc2317_parent_managed = forms.NullBooleanField(
+        required=False,
+        label="Parent Managed",
+    )
+    rfc2317_parent_zone_id = DynamicModelMultipleChoiceField(
+        queryset=Zone.objects.all(),
+        required=False,
+        label="Parent Zone",
+    )
+    registrar_id = DynamicModelMultipleChoiceField(
+        queryset=Registrar.objects.all(),
+        required=False,
+        label="Registrar",
+    )
+    registry_domain_id = forms.CharField(
+        required=False,
+        label="Registry Domain ID",
+    )
+    registrant_id = DynamicModelMultipleChoiceField(
+        queryset=Contact.objects.all(),
+        required=False,
+        label="Registrant",
+    )
+    admin_c_id = DynamicModelMultipleChoiceField(
+        queryset=Contact.objects.all(),
+        required=False,
+        label="Admin-C",
+    )
+    tech_c_id = DynamicModelMultipleChoiceField(
+        queryset=Contact.objects.all(),
+        required=False,
+        label="Tech-C",
+    )
+    billing_c_id = DynamicModelMultipleChoiceField(
+        queryset=Contact.objects.all(),
+        required=False,
+        label="Billing-C",
+    )
     tag = TagFilterField(Zone)
 
 
@@ -404,87 +474,6 @@ class ZoneImportForm(NetBoxModelImportForm):
         help_text="Assigned tenant",
     )
 
-    def _get_default_value(self, field):
-        _default_values = settings.PLUGINS_CONFIG.get("netbox_dns", {})
-        if _default_values.get("zone_soa_ttl", None) is None:
-            _default_values["zone_soa_ttl"] = _default_values.get(
-                "zone_default_ttl", None
-            )
-
-        return _default_values.get(f"zone_{field}", None)
-
-    def _clean_field_with_defaults(self, field):
-        if self.cleaned_data[field]:
-            value = self.cleaned_data[field]
-        else:
-            value = self._get_default_value(field)
-
-        if value is None:
-            raise ValidationError(f"{field} not set and no default value available")
-
-        return value
-
-    def clean_default_ttl(self):
-        return self._clean_field_with_defaults("default_ttl")
-
-    def clean_soa_ttl(self):
-        return self._clean_field_with_defaults("soa_ttl")
-
-    def clean_soa_mname(self):
-        soa_mname = self._clean_field_with_defaults("soa_mname")
-        if isinstance(soa_mname, str):
-            try:
-                soa_mname = NameServer.objects.get(name=soa_mname)
-            except NameServer.DoesNotExist:
-                raise ValidationError(f"Default name server {soa_mname} does not exist")
-
-        return soa_mname
-
-    def clean_soa_rname(self):
-        return self._clean_field_with_defaults("soa_rname")
-
-    def clean_soa_refresh(self):
-        return self._clean_field_with_defaults("soa_refresh")
-
-    def clean_soa_retry(self):
-        return self._clean_field_with_defaults("soa_retry")
-
-    def clean_soa_expire(self):
-        return self._clean_field_with_defaults("soa_expire")
-
-    def clean_soa_minimum(self):
-        return self._clean_field_with_defaults("soa_minimum")
-
-    def clean(self, *args, **kwargs):
-        super().clean(*args, **kwargs)
-
-        soa_serial_auto = self.cleaned_data.get("soa_serial_auto")
-        soa_serial = self.cleaned_data.get("soa_serial")
-
-        if soa_serial is None:
-            soa_serial = self._get_default_value("soa_serial")
-
-        if soa_serial_auto is None:
-            if self._get_default_value("soa_serial_auto") is not None:
-                soa_serial_auto = self._get_default_value("soa_serial_auto")
-
-            elif soa_serial is not None:
-                soa_serial_auto = False
-
-            else:
-                raise ValidationError(
-                    "SOA Serial Auto not set and no default value and SOA Serial available"
-                )
-
-        if "soa_serial_auto" in self.cleaned_data:
-            self.cleaned_data["soa_serial_auto"] = soa_serial_auto
-
-        if "soa_serial" in self.cleaned_data:
-            if soa_serial_auto:
-                self.cleaned_data["soa_serial"] = None
-            else:
-                self.cleaned_data["soa_serial"] = soa_serial
-
     class Meta:
         model = Zone
 
@@ -516,6 +505,27 @@ class ZoneImportForm(NetBoxModelImportForm):
             "tags",
         )
 
+    def clean_view(self):
+        view = self.cleaned_data.get("view")
+        if view is None:
+            return View.get_default_view()
+
+        return view
+
+    def clean_nameservers(self):
+        nameservers = self.cleaned_data.get("nameservers")
+        zone_defaults = settings.PLUGINS_CONFIG.get("netbox_dns")
+
+        if (
+            self.data.get("nameservers") is None
+            and zone_defaults.get("zone_nameservers") is not None
+        ):
+            nameservers = NameServer.objects.filter(
+                name__in=zone_defaults.get("zone_nameservers")
+            )
+
+        return nameservers
+
 
 class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     view = DynamicModelChoiceField(
@@ -557,7 +567,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     )
     soa_rname = forms.CharField(
         required=False,
-        label="SOA Responsible",
+        label="SOA RName",
     )
     soa_serial_auto = forms.NullBooleanField(
         required=False,
@@ -656,52 +666,44 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     model = Zone
 
     fieldsets = (
-        (
-            None,
-            (
-                "view",
-                "status",
-                "nameservers",
-                "default_ttl",
-                "description",
-                "tenant",
-            ),
+        FieldSet(
+            "view",
+            "status",
+            "nameservers",
+            "default_ttl",
+            "description",
+            name="Attributes",
         ),
-        (
-            "SOA",
-            (
-                "soa_ttl",
-                "soa_mname",
-                "soa_rname",
-                "soa_serial_auto",
-                "soa_serial",
-                "soa_refresh",
-                "soa_retry",
-                "soa_expire",
-                "soa_minimum",
-            ),
+        FieldSet(
+            "soa_ttl",
+            "soa_mname",
+            "soa_rname",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "soa_serial_auto",
+            "soa_serial",
+            name="SOA",
         ),
-        (
-            "RFC2317",
-            (
-                "rfc2317_prefix",
-                "rfc2317_parent_managed",
-            ),
+        FieldSet(
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            name="RFC 2317",
         ),
-        (
-            "Domain Registration",
-            (
-                "registrar",
-                "registry_domain_id",
-                "registrant",
-                "admin_c",
-                "tech_c",
-                "billing_c",
-            ),
+        FieldSet(
+            "registrar",
+            "registry_domain_id",
+            "registrant",
+            "admin_c",
+            "tech_c",
+            "billing_c",
+            name="Domain Registration",
         ),
+        FieldSet("tenant_group", "tenant", name="Tenancy"),
     )
+
     nullable_fields = (
-        "view",
         "description",
         "rfc2317_prefix",
         "registrar",
@@ -711,11 +713,3 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "tech_c",
         "billing_c",
     )
-
-    def clean(self):
-        """
-        If soa_serial_auto is True, set soa_serial to None.
-        """
-        cleaned_data = super().clean()
-        if cleaned_data.get("soa_serial_auto"):
-            cleaned_data["soa_serial"] = None