netbox-plugin-dns 1.1.0b7__py3-none-any.whl → 1.1.1__py3-none-any.whl

netbox_dns/forms/zone.py

@@ -30,7 +30,7 @@ from netbox_dns.models import (
     Zone,
     NameServer,
     Registrar,
-    Contact,
+    RegistrationContact,
     ZoneTemplate,
 )
 from netbox_dns.choices import ZoneStatusChoices
@@ -421,22 +421,22 @@ class ZoneFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         label="Registry Domain ID",
     )
     registrant_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Registrant",
     )
     admin_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Admin-C",
     )
     tech_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Tech-C",
     )
     billing_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Billing-C",
     )
@@ -532,7 +532,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         help_text="Domain ID assigned by the registry",
     )
     registrant = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Owner of the domain",
@@ -541,7 +541,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     admin_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Administrative contact for the domain",
@@ -550,7 +550,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     tech_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Technical contact for the domain",
@@ -559,7 +559,7 @@ class ZoneImportForm(ZoneTemplateUpdateMixin, NetBoxModelImportForm):
         },
     )
     billing_c = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         to_field_name="contact_id",
         help_text="Billing contact for the domain",
@@ -719,21 +719,21 @@ class ZoneBulkEditForm(NetBoxModelBulkEditForm):
         label="Registry Domain ID",
     )
     registrant = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
     )
     admin_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Administrative Contact",
     )
     tech_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Technical Contact",
     )
     billing_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.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,
-    Contact,
+    RegistrationContact,
 )
 
 
@@ -117,22 +117,22 @@ class ZoneTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         label="Registrar",
     )
     registrant_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Registrant",
     )
     admin_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Admin-C",
     )
     tech_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Tech-C",
     )
     billing_c_id = DynamicModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Billing-C",
     )
@@ -162,7 +162,7 @@ class ZoneTemplateImportForm(NetBoxModelImportForm):
         },
     )
     registrant = CSVModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.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=Contact.objects.all(),
+        queryset=RegistrationContact.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=Contact.objects.all(),
+        queryset=RegistrationContact.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=Contact.objects.all(),
+        queryset=RegistrationContact.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=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
     )
     admin_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Administrative Contact",
     )
     tech_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Technical Contact",
     )
     billing_c = DynamicModelChoiceField(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         required=False,
         label="Billing Contact",
     )

netbox_dns/graphql/__init__.py

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

netbox_dns/graphql/filters.py

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

netbox_dns/graphql/schema.py

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

netbox_dns/graphql/types.py

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

netbox_dns/migrations/0007_alter_ordering_options.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.0.7 on 2024-08-27 09:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0006_templating"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="record",
+            options={"ordering": ("fqdn", "zone", "name", "type", "value", "status")},
+        ),
+        migrations.AlterModelOptions(
+            name="recordtemplate",
+            options={"ordering": ("name",)},
+        ),
+        migrations.AlterModelOptions(
+            name="zonetemplate",
+            options={"ordering": ("name",)},
+        ),
+    ]

netbox_dns/migrations/{0007_view_prefixes.py → 0008_view_prefixes.py}

@@ -4,7 +4,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
     dependencies = [
         ("ipam", "0067_ipaddress_index_host"),
-        ("netbox_dns", "0006_templating"),
+        ("netbox_dns", "0007_alter_ordering_options"),
     ]
 
     operations = [

netbox_dns/migrations/0009_rename_contact_registrationcontact.py

@@ -0,0 +1,36 @@
+from django.db import migrations, connection
+
+
+def remove_object_changes(apps, schema_editor):
+    if "objectchange" in apps.all_models.get("core"):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                "DELETE FROM core_objectchange WHERE changed_object_type_id in (SELECT id FROM django_content_type WHERE app_label='netbox_dns' AND model='contact')"
+            )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("netbox_dns", "0008_view_prefixes"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="Contact",
+            new_name="RegistrationContact",
+        ),
+        migrations.RunSQL(
+            "ALTER TABLE netbox_dns_contact_id_seq RENAME TO netbox_dns_registrationcontact_id_seq"
+        ),
+        migrations.RunSQL(
+            "ALTER INDEX netbox_dns_contact_pkey RENAME TO netbox_dns_registrationcontact_pkey"
+        ),
+        migrations.RunSQL(
+            "ALTER INDEX netbox_dns_contact_contact_id_50e9d89d_like RENAME TO netbox_dns_registrationcontact_contact_id_6ff98464_like"
+        ),
+        migrations.RunSQL(
+            "ALTER INDEX netbox_dns_contact_contact_id_key RENAME TO netbox_dns_contact_registrationcontact_id_key"
+        ),
+        migrations.RunPython(remove_object_changes),
+    ]

netbox_dns/models/__init__.py

@@ -2,7 +2,7 @@ from .zone import *
 from .nameserver import *
 from .record import *
 from .view import *
-from .contact import *
+from .registration_contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *

netbox_dns/models/nameserver.py

@@ -7,6 +7,7 @@ from django.urls import reverse
 
 from netbox.models import NetBoxModel
 from netbox.search import SearchIndex, register_search
+from netbox.models.features import ContactsMixin
 
 from netbox_dns.utilities import (
     name_to_unicode,
@@ -26,7 +27,7 @@ __all__ = (
 )
 
 
-class NameServer(ObjectModificationMixin, NetBoxModel):
+class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     name = models.CharField(
         unique=True,
         max_length=255,
@@ -43,13 +44,17 @@ class NameServer(ObjectModificationMixin, NetBoxModel):
         null=True,
     )
 
-    clone_fields = ["name", "description"]
+    clone_fields = (
+        "name",
+        "description",
+    )
 
     class Meta:
-        ordering = ("name",)
         verbose_name = "Nameserver"
         verbose_name_plural = "Nameservers"
 
+        ordering = ("name",)
+
     def __str__(self):
         try:
             return dns_name.from_text(self.name, origin=None).to_unicode()

netbox_dns/models/record.py

@@ -10,6 +10,7 @@ from django.urls import reverse
 from django.conf import settings
 
 from netbox.models import NetBoxModel
+from netbox.models.features import ContactsMixin
 from netbox.search import SearchIndex, register_search
 from netbox.plugins.utils import get_plugin_config
 from utilities.querysets import RestrictedQuerySet
@@ -100,7 +101,7 @@ class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
         )
 
 
-class Record(ObjectModificationMixin, NetBoxModel):
+class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     ACTIVE_STATUS_LIST = (RecordStatusChoices.STATUS_ACTIVE,)
 
     unique_ptr_qs = Q(
@@ -193,7 +194,7 @@ class Record(ObjectModificationMixin, NetBoxModel):
     objects = RecordManager()
     raw_objects = RestrictedQuerySet.as_manager()
 
-    clone_fields = [
+    clone_fields = (
         "zone",
         "type",
         "name",
@@ -202,10 +203,20 @@ class Record(ObjectModificationMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
-    ]
+    )
 
     class Meta:
-        ordering = ("zone", "name", "type", "value", "status")
+        verbose_name = "Record"
+        verbose_name_plural = "Records"
+
+        ordering = (
+            "fqdn",
+            "zone",
+            "name",
+            "type",
+            "value",
+            "status",
+        )
 
     def __str__(self):
         try:

netbox_dns/models/record_template.py

@@ -85,7 +85,10 @@ class RecordTemplate(NetBoxModel):
     )
 
     class Meta:
-        ordering = ["name"]
+        verbose_name = "Record Template"
+        verbose_name_plural = "Record Templates"
+
+        ordering = ("name",)
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/registrar.py

@@ -59,7 +59,13 @@ class Registrar(NetBoxModel):
         return str(self.name)
 
     class Meta:
-        ordering = ("name", "iana_id")
+        verbose_name = "Registrar"
+        verbose_name_plural = "Registrars"
+
+        ordering = (
+            "name",
+            "iana_id",
+        )
 
 
 @register_search