netbox-plugin-dns 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

netbox_dns/filtersets/zone.py

@@ -2,6 +2,8 @@ import netaddr
 
 import django_filters
 from django.db.models import Q
+from django.utils.translation import gettext as _
+from django.utils.translation import pgettext as _p
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
@@ -20,69 +22,69 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     )
     view_id = django_filters.ModelMultipleChoiceFilter(
         queryset=View.objects.all(),
-        label="View ID",
+        label=_("View ID"),
     )
     view = django_filters.ModelMultipleChoiceFilter(
         queryset=View.objects.all(),
         field_name="view__name",
         to_field_name="name",
-        label="View",
+        label=_p("DNS", "View"),
     )
     # DEPRECATED: Remove in 1.1
     name_server_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",
         to_field_name="id",
-        label="Nameserver IDs",
+        label=_("Nameserver IDs"),
     )
     # DEPRECATED: Remove in 1.1
     name_server = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers__name",
         to_field_name="name",
-        label="Nameservers",
+        label=_("Nameservers"),
     )
     nameserver_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",
         to_field_name="id",
-        label="Nameservers ID",
+        label=_("Nameservers ID"),
     )
     nameserver = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers__name",
         to_field_name="name",
-        label="Nameserver",
+        label=_("Nameserver"),
     )
     soa_mname_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
-        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"),
     )
     arpa_network = MultiValueCharFilter(
         method="filter_arpa_network",
-        label="ARPA Network",
+        label=_("ARPA Network"),
     )
     rfc2317_prefix = MultiValueCharFilter(
         method="filter_rfc2317_prefix",
-        label="RFC2317 Prefix",
+        label=_("RFC2317 Prefix"),
     )
     rfc2317_parent_zone_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Zone.objects.all(),
         field_name="rfc2317_parent_zone",
         to_field_name="id",
-        label="RFC2317 Parent Zone",
+        label=_("RFC2317 Parent Zone"),
     )
     rfc2317_parent_zone = django_filters.ModelMultipleChoiceFilter(
         queryset=Zone.objects.all(),
         field_name="rfc2317_parent_zone__name",
         to_field_name="name",
-        label="RFC2317 Parent Zone",
+        label=_("RFC2317 Parent Zone"),
     )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
@@ -92,50 +94,50 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=Registrar.objects.all(),
         field_name="registrar__name",
         to_field_name="name",
-        label="Registrar",
+        label=_("Registrar"),
     )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Registrant ID",
+        label=_("Registrant ID"),
     )
     registrant = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="registrant__contact_id",
         to_field_name="contact_id",
-        label="Registrant",
+        label=_("Registrant"),
     )
     admin_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Administrative RegistrationContact ID",
+        label=_("Administrative Contact ID"),
     )
     admin_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="admin_c__contact_id",
         to_field_name="contact_id",
-        label="Administrative RegistrationContact",
+        label=_("Administrative Contact"),
     )
     tech_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Technical RegistrationContact ID",
+        label=_("Technical Contact ID"),
     )
     tech_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="tech_c__contact_id",
         to_field_name="contact_id",
-        label="Technical RegistrationContact",
+        label=_("Technical Contact"),
     )
     billing_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Billing RegistrationContact ID",
+        label=_("Billing Contact ID"),
     )
     billing_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="billing_c__contact_id",
         to_field_name="contact_id",
-        label="Billing RegistrationContact",
+        label=_("Billing Contact"),
     )
     active = django_filters.BooleanFilter(
-        label="Zone is active",
+        label=_("Zone is active"),
     )
 
     class Meta:

netbox_dns/filtersets/zone_template.py

@@ -1,6 +1,7 @@
 import django_filters
 
 from django.db.models import Q
+from django.utils.translation import gettext as _
 
 from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
@@ -22,75 +23,75 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         queryset=RecordTemplate.objects.all(),
         field_name="record_templates",
         to_field_name="id",
-        label="Record Template ID",
+        label=_("Record Template ID"),
     )
     record_template = django_filters.ModelMultipleChoiceFilter(
         queryset=RecordTemplate.objects.all(),
         field_name="record_templates__name",
         to_field_name="name",
-        label="Record Template",
+        label=_("Record Template"),
     )
     nameserver_id = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers",
         to_field_name="id",
-        label="Nameservers ID",
+        label=_("Nameservers ID"),
     )
     nameserver = django_filters.ModelMultipleChoiceFilter(
         queryset=NameServer.objects.all(),
         field_name="nameservers__name",
         to_field_name="name",
-        label="Nameserver",
+        label=_("Nameserver"),
     )
     registrar_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
-        label="Registrar ID",
+        label=_("Registrar ID"),
     )
     registrar = django_filters.ModelMultipleChoiceFilter(
         queryset=Registrar.objects.all(),
         field_name="registrar__name",
         to_field_name="name",
-        label="Registrar",
+        label=_("Registrar"),
     )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Registrant ID",
+        label=_("Registrant ID"),
     )
     registrant = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="registrant__contact_id",
         to_field_name="contact_id",
-        label="Registrant",
+        label=_("Registrant"),
     )
     admin_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Administrative RegistrationContact ID",
+        label=_("Administrative Contact ID"),
     )
     admin_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="admin_c__contact_id",
         to_field_name="contact_id",
-        label="Administrative RegistrationContact",
+        label=_("Administrative Contact"),
     )
     tech_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Technical RegistrationContact ID",
+        label=_("Technical Contact ID"),
     )
     tech_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="tech_c__contact_id",
         to_field_name="contact_id",
-        label="Technical RegistrationContact",
+        label=_("Technical Contact"),
     )
     billing_c_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
-        label="Billing RegistrationContact ID",
+        label=_("Billing Contact ID"),
     )
     billing_c = django_filters.ModelMultipleChoiceFilter(
         queryset=RegistrationContact.objects.all(),
         field_name="billing_c__contact_id",
         to_field_name="contact_id",
-        label="Billing RegistrationContact",
+        label=_("Billing Contact"),
     )
 
     class Meta:

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,
@@ -14,7 +15,7 @@ from utilities.forms.fields import (
     DynamicModelMultipleChoiceField,
 )
 from utilities.forms.rendering import FieldSet
-from tenancy.models import Tenant
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import NameServer, Zone
@@ -37,51 +38,61 @@ class NameServerForm(TenancyForm, NetBoxModelForm):
         if initial_name:
             self.initial["name"] = name_to_unicode(initial_name)
 
+    name = forms.CharField(
+        required=True,
+        label=_("Name"),
+    )
+
     fieldsets = (
-        FieldSet("name", "description", name="Nameserver"),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
-        FieldSet("tags", name="Tags"),
+        FieldSet("name", "description", name=_("Nameserver")),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
+        FieldSet("tags", name=_("Tags")),
     )
 
     class Meta:
         model = NameServer
-        fields = ("name", "description", "tags", "tenant")
+        fields = ("name", "description", "tags", "tenant_group", "tenant")
 
 
 class NameServerFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = NameServer
 
+    name = forms.CharField(
+        required=False,
+        label=_("Name"),
+    )
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
-        label="Zones",
+        label=_("Zones"),
     )
     soa_zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
-        label="SOA Zones",
-    )
-    name = forms.CharField(
-        required=False,
+        label=_("SOA Zones"),
     )
     description = forms.CharField(
         required=False,
+        label=_("Description"),
     )
     tag = TagFilterField(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"),
+        FieldSet("name", "zone_id", "soa_zone_id", "description", name=_("Attributes")),
+        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
 
 
 class NameServerImportForm(NetBoxModelImportForm):
+    name = forms.CharField(
+        label=_("Name"),
+    )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
 
     class Meta:
@@ -98,16 +109,29 @@ class NameServerImportForm(NetBoxModelImportForm):
 class NameServerBulkEditForm(NetBoxModelBulkEditForm):
     model = NameServer
 
-    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",
+            "tenant_group",
             "tenant",
             "tags",
-            name="Attributes",
+            name=_("Attributes"),
         ),
     )
 

netbox_dns/forms/record.py

@@ -1,4 +1,6 @@
 from django import forms
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy as _p
 
 from netbox.forms import (
     NetBoxModelBulkEditForm,
@@ -16,7 +18,7 @@ from utilities.forms.fields import (
 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
+from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import View, Zone, Record
@@ -36,12 +38,6 @@ 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)
@@ -49,7 +45,10 @@ class RecordForm(TenancyForm, NetBoxModelForm):
     view = DynamicModelChoiceField(
         queryset=View.objects.all(),
         required=False,
-        label="View",
+        initial_params={
+            "zone": "$zone",
+        },
+        label=_p("DNS", "View"),
     )
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
@@ -57,16 +56,16 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         query_params={
             "view_id": "$view",
         },
-        label="Zone",
+        label=_("Zone"),
     )
 
     disable_ptr = forms.BooleanField(
-        label="Disable PTR",
         required=False,
+        label=_("Disable PTR"),
     )
     ttl = forms.IntegerField(
         required=False,
-        label="TTL",
+        label=_("TTL"),
     )
 
     fieldsets = (
@@ -82,8 +81,8 @@ class RecordForm(TenancyForm, NetBoxModelForm):
             "description",
             name="Record",
         ),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
-        FieldSet("tags", name="Tags"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
+        FieldSet("tags", name=_("Tags")),
     )
 
     class Meta:
@@ -98,8 +97,9 @@ class RecordForm(TenancyForm, NetBoxModelForm):
             "ttl",
             "disable_ptr",
             "description",
-            "tags",
+            "tenant_group",
             "tenant",
+            "tags",
         )
 
 
@@ -108,6 +108,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
         FieldSet(
+            "view_id",
             "zone_id",
             "name",
             "fqdn",
@@ -115,42 +116,61 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
             "value",
             "disable_ptr",
             "status",
+            "active",
             "description",
-            name="Attributes",
+            name=_("Attributes"),
         ),
-        FieldSet("tenant_group_id", "tenant_id", name="Tenancy"),
+        FieldSet("tenant_group_id", "tenant_id", name=_("Tenancy")),
     )
 
     type = forms.MultipleChoiceField(
         choices=RecordTypeChoices,
         required=False,
+        label=_("Type"),
     )
     name = forms.CharField(
         required=False,
+        label=_("Name"),
     )
     fqdn = forms.CharField(
         required=False,
-        label="FQDN",
+        label=_("FQDN"),
     )
     value = forms.CharField(
         required=False,
+        label=_("Value"),
     )
     disable_ptr = forms.NullBooleanField(
         required=False,
-        label="Disable PTR",
         widget=forms.Select(choices=BOOLEAN_WITH_BLANK_CHOICES),
+        label=_("Disable PTR"),
     )
     status = forms.MultipleChoiceField(
         choices=RecordStatusChoices,
         required=False,
+        label=_("Status"),
+    )
+    view_id = DynamicModelMultipleChoiceField(
+        queryset=View.objects.all(),
+        required=False,
+        label=_("View"),
     )
     zone_id = DynamicModelMultipleChoiceField(
         queryset=Zone.objects.all(),
         required=False,
-        label="Zone",
+        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)
 
@@ -177,38 +197,37 @@ class RecordImportForm(NetBoxModelImportForm):
         queryset=Zone.objects.all(),
         to_field_name="name",
         required=True,
-        help_text="Zone",
+        label=_("Zone"),
     )
     view = CSVModelChoiceField(
         queryset=View.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="View the zone belongs to",
+        label=_p("DNS", "View"),
     )
     type = CSVChoiceField(
         choices=RecordTypeChoices,
         required=True,
-        help_text="Record Type",
+        label=_("Type"),
     )
     status = CSVChoiceField(
         choices=RecordStatusChoices,
         required=False,
-        help_text="Record status",
+        label=_("Status"),
     )
     ttl = forms.IntegerField(
         required=False,
-        help_text="TTL",
+        label=_("TTL"),
     )
     disable_ptr = forms.BooleanField(
         required=False,
-        label="Disable PTR",
-        help_text="Disable generation of a PTR record",
+        label=_("Disable PTR"),
     )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name="name",
         required=False,
-        help_text="Assigned tenant",
+        label=_("Tenant"),
     )
 
     def is_valid(self):
@@ -242,35 +261,45 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
     zone = DynamicModelChoiceField(
         queryset=Zone.objects.all(),
         required=False,
+        label=_("Zone"),
     )
     type = forms.ChoiceField(
         choices=add_blank_choice(RecordTypeChoices),
         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(
         required=False,
-        label="TTL",
+        label=_("TTL"),
     )
     disable_ptr = forms.NullBooleanField(
         required=False,
-        label="Disable PTR",
         widget=BulkEditNullBooleanSelect(),
+        label=_("Disable PTR"),
     )
     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 = (
@@ -282,8 +311,8 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
             "ttl",
             "disable_ptr",
             "description",
-            name="Attributes",
+            name=_("Attributes"),
         ),
-        FieldSet("tenant_group", "tenant", name="Tenancy"),
+        FieldSet("tenant_group", "tenant", name=_("Tenancy")),
     )
     nullable_fields = ("description", "ttl", "tenant")