netbox-plugin-dns 0.22.8__py3-none-any.whl → 1.0.0__py3-none-any.whl

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,143 @@
+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")]
+    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, maanged=True)
+            .exclude(type=RecordTypeChoices.PTR, managed=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)

netbox_dns/management/commands/setup_coupling.py

@@ -1,10 +1,10 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
-from django.contrib.contenttypes.models import ContentType
+from core.models import ObjectType
 from extras.models import CustomField
 from extras.choices import CustomFieldTypeChoices
 from ipam.models import IPAddress
-from netbox_dns.models import Record, Zone
+from netbox_dns.models import Zone
 
 
 class Command(BaseCommand):
@@ -17,7 +17,7 @@ class Command(BaseCommand):
         parser.add_argument("--verbose", action="store_true", help="Verbose output")
 
     def handle(self, *model_names, **options):
-        ipaddress_object_type = ContentType.objects.get_for_model(IPAddress)
+        ipaddress_object_type = ObjectType.objects.get_for_model(IPAddress)
 
         if options["remove"]:
             for cf in (
@@ -28,18 +28,18 @@ class Command(BaseCommand):
             ):
                 try:
                     CustomField.objects.get(
-                        name=cf, content_types=ipaddress_object_type
+                        name=cf, object_types=ipaddress_object_type
                     ).delete()
                     if options.get("verbose"):
                         self.stdout.write(f"Custom field '{cf}' removed")
-                except:
+                except CustomField.DoesNotExist:
                     pass
 
         else:
             if not CustomField.objects.filter(
                 name="ipaddress_dns_record_name",
                 type=CustomFieldTypeChoices.TYPE_TEXT,
-                content_types=ipaddress_object_type,
+                object_types=ipaddress_object_type,
             ).exists():
                 cf_name = CustomField.objects.create(
                     name="ipaddress_dns_record_name",
@@ -48,7 +48,7 @@ class Command(BaseCommand):
                     required=False,
                     group_name="DNS",
                 )
-                cf_name.content_types.set([ipaddress_object_type])
+                cf_name.object_types.set([ipaddress_object_type])
                 if options.get("verbose"):
                     self.stdout.write(
                         "Created custom field 'ipaddress_dns_record_name'"
@@ -57,7 +57,7 @@ class Command(BaseCommand):
             if not CustomField.objects.filter(
                 name="ipaddress_dns_record_ttl",
                 type=CustomFieldTypeChoices.TYPE_INTEGER,
-                content_types=ipaddress_object_type,
+                object_types=ipaddress_object_type,
             ).exists():
                 cf_ttl = CustomField.objects.create(
                     name="ipaddress_dns_record_ttl",
@@ -68,14 +68,14 @@ class Command(BaseCommand):
                     required=False,
                     group_name="DNS",
                 )
-                cf_ttl.content_types.set([ipaddress_object_type])
+                cf_ttl.object_types.set([ipaddress_object_type])
                 if options.get("verbose"):
                     self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
             if not CustomField.objects.filter(
                 name="ipaddress_dns_record_disable_ptr",
                 type=CustomFieldTypeChoices.TYPE_BOOLEAN,
-                content_types=ipaddress_object_type,
+                object_types=ipaddress_object_type,
             ).exists():
                 cf_disable_ptr = CustomField.objects.create(
                     name="ipaddress_dns_record_disable_ptr",
@@ -85,7 +85,7 @@ class Command(BaseCommand):
                     default=False,
                     group_name="DNS",
                 )
-                cf_disable_ptr.content_types.set([ipaddress_object_type])
+                cf_disable_ptr.object_types.set([ipaddress_object_type])
                 if options.get("verbose"):
                     self.stdout.write(
                         "Created custom field 'ipaddress_dns_record_disable_ptr'"
@@ -94,16 +94,16 @@ class Command(BaseCommand):
             if not CustomField.objects.filter(
                 name="ipaddress_dns_zone_id",
                 type=CustomFieldTypeChoices.TYPE_OBJECT,
-                content_types=ipaddress_object_type,
+                object_types=ipaddress_object_type,
             ).exists():
                 cf_zone = CustomField.objects.create(
                     name="ipaddress_dns_zone_id",
                     label="Zone",
                     type=CustomFieldTypeChoices.TYPE_OBJECT,
-                    object_type=ContentType.objects.get_for_model(Zone),
+                    related_object_type=ObjectType.objects.get_for_model(Zone),
                     required=False,
                     group_name="DNS",
                 )
-                cf_zone.content_types.set([ipaddress_object_type])
+                cf_zone.object_types.set([ipaddress_object_type])
                 if options.get("verbose"):
                     self.stdout.write("Created custom field 'ipaddress_dns_zone_id'")

netbox_dns/management/commands/update_soa.py

@@ -19,4 +19,4 @@ class Command(BaseCommand):
                 self.stdout.write(f"Updating the SOA record for zone {zone.name}")
             zone.update_soa_record()
 
-        self.stdout.write(f"All SOA records have been updated")
+        self.stdout.write("All SOA records have been updated")

netbox_dns/migrations/0001_squashed_netbox_dns_0_15.py

@@ -9,35 +9,8 @@ import netbox_dns.fields.network
 
 
 class Migration(migrations.Migration):
-    replaces = [
-        ("netbox_dns", "0001_initial"),
-        ("netbox_dns", "0015_add_record_status"),
-        ("netbox_dns", "0013_add_nameserver_zone_record_description"),
-        ("netbox_dns", "0011_add_view_model"),
-        ("netbox_dns", "0002_zone_default_ttl"),
-        ("netbox_dns", "0003_soa_managed_records"),
-        ("netbox_dns", "0004_create_ptr_for_a_aaaa_records"),
-        ("netbox_dns", "0006_zone_soa_serial_auto"),
-        ("netbox_dns", "0007_alter_zone_soa_serial_auto"),
-        ("netbox_dns", "0005_update_ns_records"),
-        ("netbox_dns", "0008_zone_status_names"),
-        ("netbox_dns", "0009_netbox32"),
-        ("netbox_dns", "0010_update_soa_records"),
-        ("netbox_dns", "0012_adjust_zone_and_record"),
-        ("netbox_dns", "0014_add_view_description"),
-        ("netbox_dns", "0016_cleanup_ptr_records"),
-        ("netbox_dns", "0017_alter_record_ttl"),
-        ("netbox_dns", "0018_zone_arpa_network"),
-        ("netbox_dns", "0019_update_ns_ttl"),
-    ]
-
-    initial = True
-
     dependencies = [
-        ("extras", "0072_created_datetimefield"),
-        ("extras", "0062_clear_secrets_changelog"),
         ("extras", "0073_journalentry_tags_custom_fields"),
-        ("extras", "0059_exporttemplate_as_attachment"),
     ]
 
     operations = [