netbox-plugin-dns 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

netbox_dns/forms/view.py

@@ -1,7 +1,9 @@
 from django import forms
 from django.conf import settings
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, FieldError
 from django.db.models import Q, Count
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -18,9 +20,10 @@ from utilities.forms.fields import (
 )
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.rendering import FieldSet
-from tenancy.models import Tenant
+from utilities.forms.fields import JSONField
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
-from ipam.models import Prefix
+from ipam.models import Prefix, IPAddress
 from netbox.context import current_request
 
 from netbox_dns.models import View
@@ -29,6 +32,7 @@ from netbox_dns.utilities import (
     check_dns_records,
     get_ip_addresses_by_prefix,
     get_views_by_prefix,
+    get_query_from_filter,
 )
 
 
@@ -45,7 +49,7 @@ class ViewPrefixUpdateMixin:
     def clean(self, *args, **kwargs):
         super().clean(*args, **kwargs)
 
-        if self.instance.pk is None or "prefixes" not in self.changed_data:
+        if self.instance._state.adding or "prefixes" not in self.changed_data:
             return
 
         prefixes = self.cleaned_data.get("prefixes")
@@ -97,35 +101,36 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
 
         if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
             del self.fields["prefixes"]
+            del self.fields["ip_address_filter"]
 
         if request := current_request.get():
             if not request.user.has_perm("ipam.view_prefix"):
                 self._saved_prefixes = self.initial["prefixes"]
                 self.initial["prefixes"] = []
                 self.fields["prefixes"].disabled = True
-                self.fields["prefixes"].widget.attrs[
-                    "placeholder"
-                ] = "You do not have permission to modify assigned prefixes"
-
-    def clean_prefixes(self):
-        if hasattr(self, "_saved_prefixes"):
-            return self._saved_prefixes
-
-        return self.cleaned_data["prefixes"]
+                self.fields["prefixes"].widget.attrs["placeholder"] = _(
+                    "You do not have permission to modify assigned prefixes"
+                )
 
     prefixes = PrefixDynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
-        label="IPAM Prefixes",
         context={
             "depth": None,
         },
+        label=_("IPAM Prefixes"),
+    )
+    ip_address_filter = JSONField(
+        required=False,
+        help_text=_("Specify criteria for address record creation in JSON form"),
+        label=_("IP Address Filter"),
     )
 
     fieldsets = (
-        FieldSet("name", "default_view", "description", "tags", name="View"),
-        FieldSet("prefixes"),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("name", "default_view", "description", name=_p("DNS", "View")),
+        FieldSet("prefixes", "ip_address_filter"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
+        FieldSet("tags", name=_("Tags")),
     )
 
     class Meta:
@@ -134,11 +139,32 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
             "name",
             "default_view",
             "description",
-            "tags",
-            "tenant",
             "prefixes",
+            "ip_address_filter",
+            "tenant_group",
+            "tenant",
+            "tags",
         )
 
+    def clean_prefixes(self):
+        if hasattr(self, "_saved_prefixes"):
+            return self._saved_prefixes
+
+        return self.cleaned_data["prefixes"]
+
+    def clean_ip_address_filter(self):
+        ip_address_filter = self.cleaned_data.get("ip_address_filter")
+
+        try:
+            IPAddress.objects.filter(get_query_from_filter(ip_address_filter)).exists()
+        except (FieldError, ValueError) as exc:
+            self.add_error(
+                "ip_address_filter",
+                _("Invalid filter for IPAddress: {error}").format(error=exc),
+            )
+
+        return ip_address_filter
+
 
 class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     def __init__(self, *args, **kwargs):
@@ -150,9 +176,9 @@ class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = View
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
-        FieldSet("name", "default_view", "description", name="Attributes"),
+        FieldSet("name", "default_view", "description", name=_("Attributes")),
         FieldSet("prefix_id"),
-        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
+        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
 
     name = forms.CharField(
@@ -168,10 +194,10 @@ class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     prefix_id = PrefixDynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
-        label="Prefix",
         context={
             "depth": None,
         },
+        label=_("Prefix"),
     )
     tag = TagFilterField(View)
 
@@ -187,13 +213,14 @@ class ViewImportForm(ViewPrefixUpdateMixin, NetBoxModelImportForm):
         queryset=Prefix.objects.all(),
         to_field_name="id",
         required=False,
-        help_text="Prefix IDs assigned to the view",
+        help_text=_("Prefix IDs assigned to the view"),
+        label=_("Prefixes"),
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
 
     class Meta:
@@ -204,16 +231,28 @@ class ViewImportForm(ViewPrefixUpdateMixin, NetBoxModelImportForm):
 class ViewBulkEditForm(NetBoxModelBulkEditForm):
     model = View
 
-    description = forms.CharField(max_length=200, required=False)
-    tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
+    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"),
+    )
 
     fieldsets = (
         FieldSet(
-            "name",
             "description",
-            name="Attributes",
+            name=_("Attributes"),
         ),
-        FieldSet("tenant", name="Tenancy"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
     )
 
     nullable_fields = ("description", "tenant")
@@ -223,8 +262,10 @@ class ViewPrefixEditForm(forms.ModelForm):
     views = DynamicModelMultipleChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label="Assigned DNS Views",
-        help_text="Explicitly assigning DNS views overrides all inherited views for this prefix",
+        help_text=_(
+            "Explicitly assigning DNS views overrides all inherited views for this prefix"
+        ),
+        label=_("Assigned DNS Views"),
     )
 
     class Meta:
@@ -242,9 +283,9 @@ class ViewPrefixEditForm(forms.ModelForm):
                 self._permission_denied = True
                 self.initial["views"] = []
                 self.fields["views"].disabled = True
-                self.fields["views"].widget.attrs[
-                    "placeholder"
-                ] = "You do not have permission to modify assigned views"
+                self.fields["views"].widget.attrs["placeholder"] = _(
+                    "You do not have permission to modify assigned views"
+                )
 
     def clean(self, *args, **kwargs):
         if self._permission_denied: