netbox-plugin-dns 1.0.0__py3-none-any.whl → 1.0b2__py3-none-any.whl

netbox_dns/__init__.py

@@ -1,20 +1,20 @@
 from netbox.plugins import PluginConfig
 
-__version__ = "1.0.0"
+__version__ = "1.0-beta2"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
-    min_version = "4.0.0"
+    min_version = "4.0-beta1"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"
     required_settings = []
     default_settings = {
         "zone_default_ttl": 86400,
-        "zone_soa_ttl": 86400,
+        "zone_soa_serial_auto": True,
         "zone_soa_serial": 1,
         "zone_soa_refresh": 43200,
         "zone_soa_retry": 7200,

netbox_dns/api/serializers_/view.py

@@ -10,10 +10,6 @@ class ViewSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:view-detail"
     )
-    default_view = serializers.BooleanField(
-        read_only=True,
-    )
-
     tenant = TenantSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
@@ -23,7 +19,6 @@ class ViewSerializer(NetBoxModelSerializer):
             "url",
             "display",
             "name",
-            "default_view",
             "tags",
             "description",
             "created",
@@ -31,4 +26,4 @@ class ViewSerializer(NetBoxModelSerializer):
             "custom_fields",
             "tenant",
         )
-        brief_fields = ("id", "url", "display", "name", "default_view", "description")
+        brief_fields = ("id", "url", "display", "name", "description")

netbox_dns/fields/network.py

@@ -9,51 +9,51 @@ from netaddr import AddrFormatError, IPNetwork
 class NetContains(Lookup):
     lookup_name = "net_contains"
 
-    def as_sql(self, compiler, connection):
-        lhs, lhs_params = self.process_lhs(compiler, connection)
-        rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
         params = lhs_params + rhs_params
-        return f"{lhs} >> {rhs}", params
+        return "%s >> %s" % (lhs, rhs), params
 
 
 class NetContainsOrEquals(Lookup):
     lookup_name = "net_contains_or_equals"
 
-    def as_sql(self, compiler, connection):
-        lhs, lhs_params = self.process_lhs(compiler, connection)
-        rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
         params = lhs_params + rhs_params
-        return f"{lhs} >>= {rhs}", params
+        return "%s >>= %s" % (lhs, rhs), params
 
 
 class NetContained(Lookup):
     lookup_name = "net_contained"
 
-    def as_sql(self, compiler, connection):
-        lhs, lhs_params = self.process_lhs(compiler, connection)
-        rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
         params = lhs_params + rhs_params
-        return f"{lhs} << {rhs}", params
+        return "%s << %s" % (lhs, rhs), params
 
 
 class NetContainedOrEqual(Lookup):
     lookup_name = "net_contained_or_equal"
 
-    def as_sql(self, compiler, connection):
-        lhs, lhs_params = self.process_lhs(compiler, connection)
-        rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
         params = lhs_params + rhs_params
-        return f"{lhs} <<= {rhs}", params
+        return "%s <<= %s" % (lhs, rhs), params
 
 
 class NetOverlap(Lookup):
     lookup_name = "net_overlap"
 
-    def as_sql(self, compiler, connection):
-        lhs, lhs_params = self.process_lhs(compiler, connection)
-        rhs, rhs_params = self.process_rhs(compiler, connection)
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
         params = lhs_params + rhs_params
-        return f"{lhs} && {rhs}", params
+        return "%s && %s" % (lhs, rhs), params
 
 
 class NetworkFormField(forms.Field):
@@ -118,6 +118,7 @@ class NetMaskLength(Transform):
     function = "MASKLEN"
     lookup_name = "net_mask_length"
 
+    @property
     def output_field(self):
         return IntegerField()
 

netbox_dns/fields/rfc2317.py

@@ -18,8 +18,8 @@ class RFC2317NetworkFormField(forms.Field):
         if isinstance(value, IPNetwork):
             if value.version == 4 and value.prefixlen > 24:
                 return value
-
-            raise ValidationError(INVALID_RFC2317)
+            else:
+                raise ValidationError(INVALID_RFC2317)
 
         if len(value.split("/")) != 2:
             raise ValidationError("Please specify the prefix length")

netbox_dns/filtersets/view.py

@@ -9,7 +9,7 @@ from netbox_dns.models import View
 class ViewFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = View
-        fields = ("id", "name", "default_view", "description")
+        fields = ("id", "name", "description")
 
     def search(self, queryset, name, value):
         if not value.strip():

netbox_dns/filtersets/zone.py

@@ -31,14 +31,14 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label="View",
     )
-    # DEPRECATED: Remove in 1.1
+    # DEPRECATED: Remove in 1.0
     name_server_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",
         to_field_name="id",
         label="Nameserver IDs",
     )
-    # DEPRECATED: Remove in 1.1
+    # DEPRECATED: Remove in 1.0
     name_server = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers__name",
@@ -59,13 +59,13 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     )
     soa_mname_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
-        label="SOA MName ID",
+        label="SOA MNname ID",
     )
     soa_mname = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="soa_mname__name",
         to_field_name="name",
-        label="SOA MName",
+        label="SOA MNname",
     )
     arpa_network = MultiValueCharFilter(
         method="filter_arpa_network",

netbox_dns/forms/record.py

@@ -28,30 +28,10 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        initial_zone_id = self.initial.get("zone")
-        if initial_zone_id is not None:
-            self.initial["view"] = Zone.objects.get(pk=initial_zone_id).view
-        else:
-            self.initial["view"] = View.get_default_view()
-
         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,
-        label="View",
-    )
-    zone = DynamicModelChoiceField(
-        queryset=Zone.objects.all(),
-        required=True,
-        query_params={
-            "view_id": "$view",
-        },
-        label="Zone",
-    )
-
     disable_ptr = forms.BooleanField(
         label="Disable PTR",
         required=False,
@@ -64,7 +44,6 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     fieldsets = (
         FieldSet(
             "name",
-            "view",
             "zone",
             "type",
             "value",
@@ -105,7 +84,6 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "fqdn",
             "type",
             "value",
-            "disable_ptr",
             "status",
             "description",
             name="Attributes",
@@ -127,10 +105,6 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     value = forms.CharField(
         required=False,
     )
-    disable_ptr = forms.NullBooleanField(
-        required=False,
-        label="Disable PTR",
-    )
     status = forms.MultipleChoiceField(
         choices=RecordStatusChoices,
         required=False,
@@ -157,12 +131,10 @@ class RecordImportForm(NetBoxModelImportForm):
             except forms.ValidationError:
                 pass
 
-        if view is not None:
+        if view:
             self.fields["zone"].queryset = Zone.objects.filter(view=view)
         else:
-            self.fields["zone"].queryset = Zone.objects.filter(
-                view=View.get_default_view()
-            )
+            self.fields["zone"].queryset = Zone.objects.filter(view__isnull=True)
 
     zone = CSVModelChoiceField(
         queryset=Zone.objects.all(),

netbox_dns/forms/view.py

@@ -20,29 +20,26 @@ from netbox_dns.models import View
 
 class ViewForm(TenancyForm, NetBoxModelForm):
     fieldsets = (
-        FieldSet("name", "default_view", "description", "tags", name="View"),
+        FieldSet("name", "description", "tags", name="View"),
         FieldSet("tenant_group", "tenant", name="Tenancy"),
     )
 
     class Meta:
         model = View
-        fields = ("name", "default_view", "description", "tags", "tenant")
+        fields = ("name", "description", "tags", "tenant")
 
 
 class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = View
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "default_view", "description", name="Attributes"),
+        FieldSet("name", "description", name="Attributes"),
         FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
     )
 
     name = forms.CharField(
         required=False,
     )
-    default_view = forms.NullBooleanField(
-        required=False,
-    )
     description = forms.CharField(
         required=False,
     )

netbox_dns/forms/zone.py

@@ -1,5 +1,6 @@
 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
 
@@ -55,7 +56,7 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
     )
     soa_rname = forms.CharField(
         required=True,
-        label="SOA RName",
+        label="SOA Responsible",
         help_text="Mailbox of the zone's administrator",
     )
     soa_serial_auto = forms.BooleanField(
@@ -146,16 +147,19 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
     )
 
     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)
 
-        if self.initial.get("view") is None:
-            self.initial["view"] = View.get_default_view()
-
         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)
+
         for setting in (
             "default_ttl",
             "soa_ttl",
@@ -166,17 +170,16 @@ class ZoneForm(TenancyForm, NetBoxModelForm):
             "soa_expire",
             "soa_minimum",
         ):
-            if self.initial.get(setting) in (None, ""):
-                self.initial[setting] = defaults.get(f"zone_{setting}")
+            _initialize(self.initial, setting)
 
-        if self.initial.get("soa_ttl") is None:
-            self.initial["soa_ttl"] = self.initial.get("default_ttl")
+        if self.initial.get("soa_ttl", None) is None:
+            self.initial["soa_ttl"] = self.initial.get("default_ttl", None)
 
         if self.initial.get("soa_serial_auto"):
             self.initial["soa_serial"] = None
 
-        if self.initial.get("soa_mname") is None:
-            default_soa_mname = defaults.get("zone_soa_mname")
+        if self.initial.get("soa_mname", None) in (None, ""):
+            default_soa_mname = defaults.get("zone_soa_mname", None)
             if default_soa_mname is not None:
                 try:
                     self.initial["soa_mname"] = NameServer.objects.get(
@@ -242,18 +245,6 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         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",
@@ -285,32 +276,6 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     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,
@@ -474,6 +439,87 @@ 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
 
@@ -505,27 +551,6 @@ 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(
@@ -567,7 +592,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     )
     soa_rname = forms.CharField(
         required=False,
-        label="SOA RName",
+        label="SOA Responsible",
     )
     soa_serial_auto = forms.NullBooleanField(
         required=False,
@@ -704,6 +729,7 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     nullable_fields = (
+        "view",
         "description",
         "rfc2317_prefix",
         "registrar",
@@ -713,3 +739,8 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         "tech_c",
         "billing_c",
     )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if cleaned_data.get("soa_serial_auto"):
+            cleaned_data["soa_serial"] = None

netbox_dns/graphql/types.py

@@ -36,7 +36,10 @@ class NetBoxDNSZoneType(NetBoxObjectType):
     name: str
     status: str
     active: bool
-    view: Annotated["NetBoxDNSViewType", strawberry.lazy("netbox_dns.graphql.types")]
+    view: (
+        Annotated["NetBoxDNSViewType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
     nameservers: (
         Annotated[
             "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")

netbox_dns/migrations/0001_squashed_netbox_dns_0_22.py

@@ -1,7 +1,5 @@
 # Generated by Django 5.0.1 on 2024-02-12 14:49
 
-from dns import name as dns_name
-
 import django.core.validators
 import django.db.models.deletion
 import netbox_dns.fields.address
@@ -50,9 +48,9 @@ def update_record_fqdn(apps, schema_editor):
 
     for record in Record.objects.filter(fqdn__isnull=True):
         zone = dns_name.from_text(record.zone.name, origin=dns_name.root)
-        _fqdn = dns_name.from_text(record.name, origin=zone)
+        fqdn = dns_name.from_text(record.name, origin=zone)
 
-        record.fqdn = _fqdn.to_text()
+        record.fqdn = fqdn.to_text()
 
         record.save()
 

netbox_dns/models/nameserver.py

@@ -55,7 +55,7 @@ class NameServer(NetBoxModel):
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
 
-    def clean(self, *args, **kwargs):
+    def clean(self):
         try:
             self.name = normalize_name(self.name)
         except NameFormatError as exc:
@@ -74,8 +74,6 @@ class NameServer(NetBoxModel):
                 }
             ) from None
 
-        super().clean(*args, **kwargs)
-
     def save(self, *args, **kwargs):
         self.full_clean()