netbox-plugin-dns 1.1.0__py3-none-any.whl → 1.1.0b1__py3-none-any.whl

netbox_dns/forms/view.py

@@ -21,13 +21,12 @@ from utilities.forms.rendering import FieldSet
 from tenancy.models import Tenant
 from tenancy.forms import TenancyForm, TenancyFilterForm
 from ipam.models import Prefix
-from netbox.context import current_request
 
 from netbox_dns.models import View
 from netbox_dns.fields import PrefixDynamicModelMultipleChoiceField
 from netbox_dns.utilities import (
-    check_dns_records,
     get_ip_addresses_by_prefix,
+    update_dns_records,
     get_views_by_prefix,
 )
 
@@ -37,7 +36,6 @@ __all__ = (
     "ViewFilterForm",
     "ViewImportForm",
     "ViewBulkEditForm",
-    "ViewPrefixEditForm",
 )
 
 
@@ -54,7 +52,7 @@ class ViewPrefixUpdateMixin:
         for prefix in prefixes.difference(old_prefixes):
             for ip_address in get_ip_addresses_by_prefix(prefix, check_view=False):
                 try:
-                    check_dns_records(ip_address, view=self.instance)
+                    update_dns_records(ip_address, commit=False, view=self.instance)
                 except ValidationError as exc:
                     self.add_error("prefixes", exc.messages)
 
@@ -76,7 +74,7 @@ class ViewPrefixUpdateMixin:
             # parent. If that's the case, the IP addresses need to be checked.
             # -
             if (parent := check_prefix.get_parents().last()) is None:
-                continue
+                return
 
             for view in get_views_by_prefix(parent):
                 if view == self.instance:
@@ -86,7 +84,7 @@ class ViewPrefixUpdateMixin:
                     check_prefix, check_view=False
                 ):
                     try:
-                        check_dns_records(ip_address, view=view)
+                        update_dns_records(ip_address, commit=False, view=view)
                     except ValidationError as exc:
                         self.add_error("prefixes", exc.messages)
 
@@ -95,24 +93,9 @@ class ViewForm(ViewPrefixUpdateMixin, TenancyForm, NetBoxModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
             del self.fields["prefixes"]
 
-        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"]
-
     prefixes = PrefixDynamicModelMultipleChoiceField(
         queryset=Prefix.objects.all(),
         required=False,
@@ -144,7 +127,7 @@ class ViewFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
             del self.fields["prefix_id"]
 
     model = View
@@ -180,7 +163,7 @@ class ViewImportForm(ViewPrefixUpdateMixin, NetBoxModelImportForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+        if settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
             del self.fields["prefixes"]
 
     prefixes = CSVModelMultipleChoiceField(
@@ -217,74 +200,3 @@ class ViewBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     nullable_fields = ("description", "tenant")
-
-
-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",
-    )
-
-    class Meta:
-        model = Prefix
-        fields = ("views",)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.initial["views"] = self.instance.netbox_dns_views.all()
-        self._permission_denied = False
-
-        if request := current_request.get():
-            if not request.user.has_perm("netbox_dns.change_view"):
-                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"
-
-    def clean(self, *args, **kwargs):
-        if self._permission_denied:
-            return
-
-        prefix = self.instance
-
-        super().clean(*args, **kwargs)
-
-        views = self.cleaned_data.get("views")
-        old_views = prefix.netbox_dns_views.all()
-
-        check_views = View.objects.none()
-
-        if not views.exists():
-            if (parent := prefix.get_parents().last()) is not None:
-                check_views = parent.netbox_dns_views.all().difference(old_views)
-
-        else:
-            check_views = views.difference(old_views)
-
-        for view in check_views:
-            try:
-                for ip_address in get_ip_addresses_by_prefix(prefix, check_view=False):
-                    check_dns_records(ip_address, view=view)
-            except ValidationError as exc:
-                self.add_error("views", exc.messages)
-
-    def save(self, *args, **kwargs):
-        prefix = self.instance
-
-        if self._permission_denied:
-            return prefix
-
-        old_views = prefix.netbox_dns_views.all()
-        views = self.cleaned_data.get("views")
-
-        for view in views.difference(old_views):
-            view.prefixes.add(prefix)
-        for view in old_views.difference(views):
-            view.prefixes.remove(prefix)
-
-        return prefix

netbox_dns/forms/zone.py

@@ -30,7 +30,7 @@ from netbox_dns.models import (
     Zone,
     NameServer,
     Registrar,
-    RegistrationContact,
+    Contact,
     ZoneTemplate,
 )
 from netbox_dns.choices import ZoneStatusChoices
@@ -81,14 +81,6 @@ class ZoneTemplateUpdateMixin:
                 else:
                     zone_data = self.cleaned_data.copy()
 
-                    custom_fields = {}
-                    for key, value in zone_data.copy().items():
-                        if key.startswith("cf_"):
-                            custom_fields[key[3:]] = value
-                            zone_data.pop(key)
-                    if custom_fields:
-                        zone_data["custom_field_data"] = custom_fields
-
                     zone_data.pop("template", None)
                     zone_data.pop("tenant_group", None)
                     zone_data.pop("_init_time", None)
@@ -105,7 +97,10 @@ class ZoneTemplateUpdateMixin:
                 raise RollbackTransaction
 
         except ValidationError as exc:
-            self.add_error("template", exc.messages)
+            if isinstance(exc, dict):
+                template_error = item.value()
+            else:
+                template_error = [exc]
         except RollbackTransaction:
             pass
 
@@ -421,22 +416,22 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         label="Registry Domain ID",
     )
     registrant_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Registrant",
     )
     admin_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Admin-C",
     )
     tech_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Tech-C",
     )
     billing_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Billing-C",
     )
@@ -532,7 +527,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         help_text="Domain ID assigned by the registry",
     )
     registrant = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Owner of the domain",
@@ -541,7 +536,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     admin_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Administrative contact for the domain",
@@ -550,7 +545,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     tech_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Technical contact for the domain",
@@ -559,7 +554,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     billing_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Billing contact for the domain",
@@ -719,21 +714,21 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         label="Registry Domain ID",
     )
     registrant = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
     )
     admin_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Administrative Contact",
     )
     tech_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Technical Contact",
     )
     billing_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Billing Contact",
     )

netbox_dns/forms/zone_template.py

@@ -22,7 +22,7 @@ from netbox_dns.models import (
     RecordTemplate,
     NameServer,
     Registrar,
-    RegistrationContact,
+    Contact,
 )
 
 
@@ -117,22 +117,22 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         label="Registrar",
     )
     registrant_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Registrant",
     )
     admin_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Admin-C",
     )
     tech_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Tech-C",
     )
     billing_c_id = DynamicModelMultipleChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Billing-C",
     )
@@ -162,7 +162,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         },
     )
     registrant = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Owner of the domain",
@@ -171,7 +171,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         },
     )
     admin_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Administrative contact for the domain",
@@ -180,7 +180,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         },
     )
     tech_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Technical contact for the domain",
@@ -189,7 +189,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         },
     )
     billing_c = CSVModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Billing contact for the domain",
@@ -237,21 +237,21 @@ class ZoneTemplateBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
     )
     registrant = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
     )
     admin_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Administrative Contact",
     )
     tech_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Technical Contact",
     )
     billing_c = DynamicModelChoiceField(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         required=False,
         label="Billing Contact",
     )

netbox_dns/graphql/__init__.py

@@ -1,7 +1,7 @@
 from .schema import (
     NetBoxDNSViewQuery,
     NetBoxDNSNameServerQuery,
-    NetBoxDNSRegistrationContactQuery,
+    NetBoxDNSContactQuery,
     NetBoxDNSRegistrarQuery,
     NetBoxDNSZoneQuery,
     NetBoxDNSRecordQuery,
@@ -14,7 +14,7 @@ schema = [
     NetBoxDNSViewQuery,
     NetBoxDNSZoneQuery,
     NetBoxDNSRecordQuery,
-    NetBoxDNSRegistrationContactQuery,
+    NetBoxDNSContactQuery,
     NetBoxDNSRegistrarQuery,
     NetBoxDNSZoneTemplateQuery,
     NetBoxDNSRecordTemplateQuery,

netbox_dns/graphql/filters.py

@@ -7,7 +7,7 @@ from netbox_dns.models import (
     View,
     Zone,
     Record,
-    RegistrationContact,
+    Contact,
     Registrar,
     ZoneTemplate,
     RecordTemplate,
@@ -17,7 +17,7 @@ from netbox_dns.filtersets import (
     ViewFilterSet,
     ZoneFilterSet,
     RecordFilterSet,
-    RegistrationContactFilterSet,
+    ContactFilterSet,
     RegistrarFilterSet,
     ZoneTemplateFilterSet,
     RecordTemplateFilterSet,
@@ -60,9 +60,9 @@ class NetBoxDNSRecordTemplateFilter(BaseFilterMixin):
     pass
 
 
-@strawberry_django.filter(RegistrationContact, lookups=True)
-@autotype_decorator(RegistrationContactFilterSet)
-class NetBoxDNSRegistrationContactFilter(BaseFilterMixin):
+@strawberry_django.filter(Contact, lookups=True)
+@autotype_decorator(ContactFilterSet)
+class NetBoxDNSContactFilter(BaseFilterMixin):
     pass
 
 

netbox_dns/graphql/schema.py

@@ -8,7 +8,7 @@ from netbox_dns.models import (
     View,
     Zone,
     Record,
-    RegistrationContact,
+    Contact,
     Registrar,
     ZoneTemplate,
     RecordTemplate,
@@ -18,66 +18,86 @@ from .types import (
     NetBoxDNSViewType,
     NetBoxDNSZoneType,
     NetBoxDNSRecordType,
-    NetBoxDNSRegistrationContactType,
+    NetBoxDNSContactType,
     NetBoxDNSRegistrarType,
     NetBoxDNSZoneTemplateType,
     NetBoxDNSRecordTemplateType,
 )
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSNameServerQuery:
-    netbox_dns_nameserver: NetBoxDNSNameServerType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_nameserver(self, id: int) -> NetBoxDNSNameServerType:
+        return NameServer.objects.get(pk=id)
+
     netbox_dns_nameserver_list: List[NetBoxDNSNameServerType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSViewQuery:
-    netbox_dns_view: NetBoxDNSViewType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_view(self, id: int) -> NetBoxDNSViewType:
+        return View.objects.get(pk=id)
+
     netbox_dns_view_list: List[NetBoxDNSViewType] = strawberry_django.field()
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSZoneQuery:
-    netbox_dns_zone: NetBoxDNSZoneType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_zone(self, id: int) -> NetBoxDNSZoneType:
+        return Zone.objects.get(pk=id)
+
     netbox_dns_zone_list: List[NetBoxDNSZoneType] = strawberry_django.field()
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSRecordQuery:
-    netbox_dns_record: NetBoxDNSRecordType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_record(self, id: int) -> NetBoxDNSRecordType:
+        return Record.objects.get(pk=id)
+
     netbox_dns_record_list: List[NetBoxDNSRecordType] = strawberry_django.field()
 
 
-@strawberry.type(name="Query")
-class NetBoxDNSRegistrationContactQuery:
-    netbox_dns_registration_contact: NetBoxDNSRegistrationContactType = (
-        strawberry_django.field()
-    )
-    netbox_dns_registration_contact_list: List[NetBoxDNSRegistrationContactType] = (
-        strawberry_django.field()
-    )
+@strawberry.type
+class NetBoxDNSContactQuery:
+    @strawberry.field
+    def netbox_dns_contact(self, id: int) -> NetBoxDNSContactType:
+        return Contact.objects.get(pk=id)
+
+    netbox_dns_contact_list: List[NetBoxDNSContactType] = strawberry_django.field()
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSRegistrarQuery:
-    netbox_dns_registrar: NetBoxDNSRegistrarType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_registrar(self, id: int) -> NetBoxDNSRegistrarType:
+        return Registrar.objects.get(pk=id)
+
     netbox_dns_registrar_list: List[NetBoxDNSRegistrarType] = strawberry_django.field()
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSZoneTemplateQuery:
-    netbox_dns_zone_template: NetBoxDNSZoneTemplateType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_zone_template(self, id: int) -> NetBoxDNSZoneTemplateType:
+        return ZoneTemplate.objects.get(pk=id)
+
     netbox_dns_zone_template_list: List[NetBoxDNSZoneTemplateType] = (
         strawberry_django.field()
     )
 
 
-@strawberry.type(name="Query")
+@strawberry.type
 class NetBoxDNSRecordTemplateQuery:
-    netbox_dns_record_template: NetBoxDNSRecordTemplateType = strawberry_django.field()
+    @strawberry.field
+    def netbox_dns_record_template(self, id: int) -> NetBoxDNSRecordTemplateType:
+        return RecordTemplate.objects.get(pk=id)
+
     netbox_dns_record_template_list: List[NetBoxDNSRecordTemplateType] = (
         strawberry_django.field()
     )

netbox_dns/graphql/types.py

@@ -4,8 +4,6 @@ import strawberry
 import strawberry_django
 
 from netbox.graphql.types import NetBoxObjectType
-from tenancy.graphql.types import TenantType
-from ipam.graphql.types import IPAddressType, PrefixType
 from netbox.graphql.scalars import BigInt
 
 from netbox_dns.models import (
@@ -13,7 +11,7 @@ from netbox_dns.models import (
     View,
     Zone,
     Record,
-    RegistrationContact,
+    Contact,
     Registrar,
     ZoneTemplate,
     RecordTemplate,
@@ -23,7 +21,7 @@ from .filters import (
     NetBoxDNSViewFilter,
     NetBoxDNSZoneFilter,
     NetBoxDNSRecordFilter,
-    NetBoxDNSRegistrationContactFilter,
+    NetBoxDNSContactFilter,
     NetBoxDNSRegistrarFilter,
     NetBoxDNSZoneTemplateFilter,
     NetBoxDNSRecordTemplateFilter,
@@ -77,31 +75,19 @@ class NetBoxDNSZoneType(NetBoxObjectType):
     )
     registry_domain_id: str | None
     registrant: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     admin_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     tech_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     billing_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     rfc2317_prefix: str | None
@@ -138,10 +124,8 @@ class NetBoxDNSRecordType(NetBoxObjectType):
     )
 
 
-@strawberry_django.type(
-    RegistrationContact, fields="__all__", filters=NetBoxDNSRegistrationContactFilter
-)
-class NetBoxDNSRegistrationContactType(NetBoxObjectType):
+@strawberry_django.type(Contact, fields="__all__", filters=NetBoxDNSContactFilter)
+class NetBoxDNSContactType(NetBoxObjectType):
     name: str
     contact_id: str
     description: str
@@ -192,31 +176,19 @@ class NetBoxDNSZoneTemplateType(NetBoxObjectType):
         | None
     )
     registrant: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     admin_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     tech_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )
     billing_c: (
-        Annotated[
-            "NetBoxDNSRegistrationContactType",
-            strawberry.lazy("netbox_dns.graphql.types"),
-        ]
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
         | None
     )