netbox-plugin-dns 0.22.9__py3-none-any.whl → 1.0b1__py3-none-any.whl

netbox_dns/forms/zone.py

@@ -19,6 +19,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
@@ -106,51 +107,43 @@ 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):
@@ -248,9 +241,20 @@ 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(
+            "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 +268,43 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
     name = forms.CharField(
         required=False,
-        label="Name",
     )
     nameservers = DynamicModelMultipleChoiceField(
         queryset=NameServer.objects.all(),
         required=False,
     )
+    description = forms.CharField(
+        required=False,
+    )
+    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)
 
 
@@ -656,50 +691,43 @@ 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",
@@ -713,9 +741,6 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
     )
 
     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

netbox_dns/graphql/__init__.py

@@ -1,27 +1,17 @@
-import graphene
-from graphene_django.converter import convert_django_field
-
-from netbox_dns.fields import NetworkField, AddressField, RFC2317NetworkField
-
-
-@convert_django_field.register(NetworkField)
-def convert_field_to_string(field, registry=None):
-    return graphene.String(description=field.help_text, required=not field.null)
-
-
-@convert_django_field.register(AddressField)
-def convert_field_to_string(field, registry=None):
-    return graphene.String(description=field.help_text, required=not field.null)
-
-
-@convert_django_field.register(RFC2317NetworkField)
-def convert_field_to_string(field, registry=None):
-    return graphene.String(description=field.help_text, required=not field.null)
-
-
-from .schema import *
-
-from .view import *
-from .zone import *
-from .nameserver import *
-from .record import *
+from .schema import (
+    NetBoxDNSViewQuery,
+    NetBoxDNSNameServerQuery,
+    NetBoxDNSContactQuery,
+    NetBoxDNSRegistrarQuery,
+    NetBoxDNSZoneQuery,
+    NetBoxDNSRecordQuery,
+)
+
+schema = [
+    NetBoxDNSNameServerQuery,
+    NetBoxDNSViewQuery,
+    NetBoxDNSZoneQuery,
+    NetBoxDNSRecordQuery,
+    NetBoxDNSContactQuery,
+    NetBoxDNSRegistrarQuery,
+]

netbox_dns/graphql/filters.py

@@ -0,0 +1,49 @@
+import strawberry_django
+
+from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin
+
+from netbox_dns.models import NameServer, View, Zone, Record, Contact, Registrar
+from netbox_dns.filtersets import (
+    NameServerFilterSet,
+    ViewFilterSet,
+    ZoneFilterSet,
+    RecordFilterSet,
+    ContactFilterSet,
+    RegistrarFilterSet,
+)
+
+
+@strawberry_django.filter(NameServer, lookups=True)
+@autotype_decorator(NameServerFilterSet)
+class NetBoxDNSNameServerFilter(BaseFilterMixin):
+    pass
+
+
+@strawberry_django.filter(View, lookups=True)
+@autotype_decorator(ViewFilterSet)
+class NetBoxDNSViewFilter(BaseFilterMixin):
+    pass
+
+
+@strawberry_django.filter(Zone, lookups=True)
+@autotype_decorator(ZoneFilterSet)
+class NetBoxDNSZoneFilter(BaseFilterMixin):
+    rfc2317_prefix: str | None
+
+
+@strawberry_django.filter(Record, lookups=True)
+@autotype_decorator(RecordFilterSet)
+class NetBoxDNSRecordFilter(BaseFilterMixin):
+    ip_address: str | None
+
+
+@strawberry_django.filter(Contact, lookups=True)
+@autotype_decorator(ContactFilterSet)
+class NetBoxDNSContactFilter(BaseFilterMixin):
+    pass
+
+
+@strawberry_django.filter(Registrar, lookups=True)
+@autotype_decorator(RegistrarFilterSet)
+class NetBoxDNSRegistrarFilter(BaseFilterMixin):
+    pass

netbox_dns/graphql/schema.py

@@ -1,11 +1,70 @@
-from .view import ViewQuery
-from .nameserver import NameServerQuery
-from .zone import ZoneQuery
-from .record import RecordQuery
+from typing import List
 
+import strawberry
+import strawberry_django
 
-class Query(ViewQuery, NameServerQuery, ZoneQuery, RecordQuery):
-    pass
+from netbox_dns.models import NameServer, View, Zone, Record, Contact, Registrar
+from .types import (
+    NetBoxDNSNameServerType,
+    NetBoxDNSViewType,
+    NetBoxDNSZoneType,
+    NetBoxDNSRecordType,
+    NetBoxDNSContactType,
+    NetBoxDNSRegistrarType,
+)
 
 
-schema = Query
+@strawberry.type
+class NetBoxDNSNameServerQuery:
+    @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
+class NetBoxDNSViewQuery:
+    @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
+class NetBoxDNSZoneQuery:
+    @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
+class NetBoxDNSRecordQuery:
+    @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
+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
+class NetBoxDNSRegistrarQuery:
+    @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()

netbox_dns/graphql/types.py

@@ -0,0 +1,146 @@
+from typing import Annotated
+
+import strawberry
+import strawberry_django
+
+from netbox.graphql.types import NetBoxObjectType
+from netbox.graphql.scalars import BigInt
+
+from netbox_dns.models import NameServer, View, Zone, Record, Contact, Registrar
+from .filters import (
+    NetBoxDNSNameServerFilter,
+    NetBoxDNSViewFilter,
+    NetBoxDNSZoneFilter,
+    NetBoxDNSRecordFilter,
+    NetBoxDNSContactFilter,
+    NetBoxDNSRegistrarFilter,
+)
+
+
+@strawberry_django.type(NameServer, fields="__all__", filters=NetBoxDNSNameServerFilter)
+class NetBoxDNSNameServerType(NetBoxObjectType):
+    name: str
+    description: str
+    tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+
+
+@strawberry_django.type(View, fields="__all__", filters=NetBoxDNSViewFilter)
+class NetBoxDNSViewType(NetBoxObjectType):
+    name: str
+    description: str
+    tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+
+
+@strawberry_django.type(Zone, fields="__all__", filters=NetBoxDNSZoneFilter)
+class NetBoxDNSZoneType(NetBoxObjectType):
+    name: str
+    status: str
+    active: bool
+    view: (
+        Annotated["NetBoxDNSViewType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    nameservers: (
+        Annotated[
+            "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")
+        ]
+        | None
+    )
+    default_ttl: BigInt
+    soa_ttl: BigInt
+    soa_mname: Annotated[
+        "NetBoxDNSNameServerType", strawberry.lazy("netbox_dns.graphql.types")
+    ]
+    soa_rname: str
+    soa_serial: BigInt
+    soa_refresh: BigInt
+    soa_retry: BigInt
+    soa_expire: BigInt
+    soa_minimum: BigInt
+    soa_serial_auto: bool
+    description: str | None
+    arpa_network: str | None
+    tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+    registrar: (
+        Annotated["NetBoxDNSRegistrarType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    registry_domain_id: str | None
+    registrant: (
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    admin_c: (
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    tech_c: (
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    billing_c: (
+        Annotated["NetBoxDNSContactType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    rfc2317_prefix: str | None
+    rfc2317_parent_managed: str
+    rfc2317_parent_zone: (
+        Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+
+
+@strawberry_django.type(Record, fields="__all__", filters=NetBoxDNSRecordFilter)
+class NetBoxDNSRecordType(NetBoxObjectType):
+    name: str
+    zone: Annotated["NetBoxDNSZoneType", strawberry.lazy("netbox_dns.graphql.types")]
+    type: str
+    value: str
+    status: str
+    ttl: BigInt | None
+    managed: bool
+    ptr_record: (
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+    disable_ptr: bool
+    description: str | None
+    tenant: Annotated["TenantType", strawberry.lazy("tenancy.graphql.types")] | None
+    ip_address: str | None
+    ipam_ip_address: (
+        Annotated["IPAddressType", strawberry.lazy("ipam.graphql.types")] | None
+    )
+    rfc2317_cname_record: (
+        Annotated["NetBoxDNSRecordType", strawberry.lazy("netbox_dns.graphql.types")]
+        | None
+    )
+
+
+@strawberry_django.type(Contact, fields="__all__", filters=NetBoxDNSContactFilter)
+class NetBoxDNSContactType(NetBoxObjectType):
+    name: str
+    contact_id: str
+    description: str
+    organization: str
+    street: str
+    city: str
+    state_province: str
+    postal_code: str
+    country: str
+    phone: str
+    phone_ext: str
+    fax: str
+    fax_ext: str
+    email: str
+
+
+@strawberry_django.type(Registrar, fields="__all__", filters=NetBoxDNSRegistrarFilter)
+class NetBoxDNSRegistrarType(NetBoxObjectType):
+    name: str
+    description: str
+    iana_id: int
+    referral_url: str
+    whois_server: str
+    address: str
+    abuse_email: str
+    abuse_phone: str

netbox_dns/management/commands/cleanup_database.py

@@ -1,6 +1,3 @@
-import dns
-from dns import rdtypes, rdata, rdatatype, rdataclass
-
 from netaddr import IPAddress, IPNetwork, AddrFormatError
 
 from django.core.management.base import BaseCommand
@@ -10,7 +7,6 @@ from netbox_dns.models import (
     ZoneStatusChoices,
     Record,
     RecordTypeChoices,
-    RecordClassChoices,
 )
 
 

netbox_dns/management/commands/cleanup_rrset_ttl.py

@@ -29,12 +29,10 @@ class Command(BaseCommand):
         self.stdout.write("RRSet cleanup completed.")
 
     def cleanup_rrset_ttl(self, **options):
-        verbose = options.get("verbosity") > 1
-
         ttl_records = (
             Record.objects.filter(ttl__isnull=False)
             .exclude(type=RecordTypeChoices.SOA)
-            .exclude(type=RecordTypeChoices.PTR, managed=True)
+            .exclude(type=RecordTypeChoices.PTR, maanged=True)
         )
         for record in ttl_records:
             records = Record.objects.filter(
@@ -45,7 +43,7 @@ class Command(BaseCommand):
 
             if records.count() == 1:
                 if options.get("verbosity") > 2:
-                    self.stdout.write(f"Ignoring single record {record.id} ({record})")
+                    self.stdout.write(f"Ignoring single record {record.pk} ({record})")
                 continue
 
             if options.get("max"):
@@ -56,7 +54,7 @@ class Command(BaseCommand):
             for record in records.exclude(ttl=ttl):
                 if options.get("verbosity") > 1:
                     self.stdout.write(
-                        f"Updating TTL for record {record.id} ({record}) to {ttl}"
+                        f"Updating TTL for record {record.pk} ({record}) to {ttl}"
                     )
                 record.ttl = ttl
                 record.save(update_fields=["ttl"], update_rrset_ttl=False)