netbox-plugin-dns 1.1.0__tar.gz → 1.1.0b1__tar.gz

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0
+Version: 1.1.0b1
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -8,7 +8,7 @@ Keywords: netbox,netbox-plugin,dns
 Author: Peter Eckel
 Author-email: pete@netbox-dns.org
 Requires-Python: >=3.10,<4.0
-Classifier: Development Status :: 5 - Production/Stable
+Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -48,7 +48,6 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 * Templating for zones and records enables faster creations of zones with given boilerplate object relations, such as name servers, tags, tenants or registration information, or records like standard SPF or MX records that are the same for a subset of zones
-* IPAM DNSsync can be used to automatically create address and pointer records for IP addresses by assigning prefixes to DNS views. When an IP address has a DNS name assigned and there are zones with matching names in the DNS views linked to the IP address' prefix, a matching DNS record will be created in these zones
 
 Other main features include:
 

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/README.md

@@ -28,7 +28,6 @@ The main focus of the plugin is to ensure the quality of the data stored in it.
 * Validation of record types such as CNAME and singletons, to ensure DNS zone validity
 * Support for [RFC 2317](https://datatracker.ietf.org/doc/html/rfc2317) delegation of PTR zones for IPv4 subnets longer than 24 bits
 * Templating for zones and records enables faster creations of zones with given boilerplate object relations, such as name servers, tags, tenants or registration information, or records like standard SPF or MX records that are the same for a subset of zones
-* IPAM DNSsync can be used to automatically create address and pointer records for IP addresses by assigning prefixes to DNS views. When an IP address has a DNS name assigned and there are zones with matching names in the DNS views linked to the IP address' prefix, a matching DNS record will be created in these zones
 
 Other main features include:
 

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/__init__.py

@@ -5,14 +5,14 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0"
+__version__ = "1.1.0-beta1"
 
 
 class DNSConfig(PluginConfig):
     name = "netbox_dns"
     verbose_name = "NetBox DNS"
     description = "NetBox plugin for DNS data"
-    min_version = "4.0.0"
+    min_version = "4.1.0-beta1"
     version = __version__
     author = "Peter Eckel"
     author_email = "pete@netbox-dns.org"
@@ -25,14 +25,12 @@ class DNSConfig(PluginConfig):
         "zone_soa_retry": 7200,
         "zone_soa_expire": 2419200,
         "zone_soa_minimum": 3600,
-        "dnssync_disabled": False,
-        "dnssync_ipaddress_active_status": [
+        "autodns_disabled": False,
+        "autodns_ipaddress_active_status": [
             IPAddressStatusChoices.STATUS_ACTIVE,
             IPAddressStatusChoices.STATUS_DHCP,
             IPAddressStatusChoices.STATUS_SLAAC,
         ],
-        "dnssync_conflict_deactivate": False,
-        "dnssync_minimum_zone_labels": 2,
         "tolerate_characters_in_zone_labels": "",
         "tolerate_underscores_in_labels": False,
         "tolerate_underscores_in_hostnames": False,  # Deprecated, will be removed in 1.2.0
@@ -52,9 +50,8 @@ class DNSConfig(PluginConfig):
     def ready(self):
         super().ready()
 
-        if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
-            import netbox_dns.signals.ipam_dnssync
-            import netbox_dns.tables.ipam_dnssync
+        if not settings.PLUGINS_CONFIG["netbox_dns"].get("autodns_disabled"):
+            from netbox_dns.signals import ipam_autodns
 
 
 #

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/nested_serializers.py

@@ -59,22 +59,6 @@ class NestedZoneSerializer(WritableNestedSerializer):
         ]
 
 
-class NestedZoneTemplateSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
-    )
-
-    class Meta:
-        model = ZoneTemplate
-        fields = (
-            "id",
-            "url",
-            "name",
-            "display",
-            "description",
-        )
-
-
 class NestedRecordSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:record-detail"
@@ -102,7 +86,6 @@ class NestedRecordSerializer(WritableNestedSerializer):
             "status",
             "ttl",
             "zone",
-            "managed",
             "active",
         ]
 
@@ -126,3 +109,19 @@ class NestedRecordTemplateSerializer(WritableNestedSerializer):
             "ttl",
             "description",
         )
+
+
+class NestedZoneTemplateSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
+    )
+
+    class Meta:
+        model = ZoneTemplate
+        fields = (
+            "id",
+            "url",
+            "name",
+            "display",
+            "description",
+        )

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/serializers.py

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

netbox_plugin_dns-1.1.0/netbox_dns/api/serializers_/registration_contact.py → netbox_plugin_dns-1.1.0b1/netbox_dns/api/serializers_/contact.py

@@ -2,19 +2,19 @@ from rest_framework import serializers
 
 from netbox.api.serializers import NetBoxModelSerializer
 
-from netbox_dns.models import RegistrationContact
+from netbox_dns.models import Contact
 
 
-__all__ = ("RegistrationContactSerializer",)
+__all__ = ("ContactSerializer",)
 
 
-class RegistrationContactSerializer(NetBoxModelSerializer):
+class ContactSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
-        view_name="plugins-api:netbox_dns-api:registrationcontact-detail"
+        view_name="plugins-api:netbox_dns-api:contact-detail"
     )
 
     class Meta:
-        model = RegistrationContact
+        model = Contact
         fields = (
             "id",
             "url",

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/serializers_/record.py

@@ -87,6 +87,5 @@ class RecordSerializer(NetBoxModelSerializer):
             "status",
             "ttl",
             "description",
-            "managed",
             "active",
         )

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/serializers_/zone.py

@@ -6,7 +6,7 @@ from tenancy.api.serializers import TenantSerializer
 from .view import ViewSerializer
 from .nameserver import NameServerSerializer
 from .registrar import RegistrarSerializer
-from .registration_contact import RegistrationContactSerializer
+from .contact import ContactSerializer
 from .zone_template import ZoneTemplateSerializer
 
 from ..nested_serializers import NestedZoneSerializer
@@ -62,28 +62,28 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text="The registrar the domain is registered with",
     )
-    registrant = RegistrationContactSerializer(
+    registrant = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The owner of the domain",
     )
-    admin_c = RegistrationContactSerializer(
+    admin_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The administrative contact for the domain",
     )
-    tech_c = RegistrationContactSerializer(
+    tech_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The technical contact for the domain",
     )
-    billing_c = RegistrationContactSerializer(
+    billing_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/serializers_/zone_template.py

@@ -8,7 +8,7 @@ from netbox_dns.api.nested_serializers import NestedRecordTemplateSerializer
 
 from .nameserver import NameServerSerializer
 from .registrar import RegistrarSerializer
-from .registration_contact import RegistrationContactSerializer
+from .contact import ContactSerializer
 
 
 __all__ = ("ZoneTemplateSerializer",)
@@ -38,28 +38,28 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
         required=False,
         help_text="The registrar the domain is registered with",
     )
-    registrant = RegistrationContactSerializer(
+    registrant = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The owner of the domain",
     )
-    admin_c = RegistrationContactSerializer(
+    admin_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The administrative contact for the domain",
     )
-    tech_c = RegistrationContactSerializer(
+    tech_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The technical contact for the domain",
     )
-    billing_c = RegistrationContactSerializer(
+    billing_c = ContactSerializer(
         nested=True,
         many=False,
         read_only=False,

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/urls.py

@@ -7,7 +7,7 @@ from netbox_dns.api.views import (
     NameServerViewSet,
     RecordViewSet,
     RegistrarViewSet,
-    RegistrationContactViewSet,
+    ContactViewSet,
     ZoneTemplateViewSet,
     RecordTemplateViewSet,
     PrefixViewSet,
@@ -21,7 +21,7 @@ router.register("zones", ZoneViewSet)
 router.register("nameservers", NameServerViewSet)
 router.register("records", RecordViewSet)
 router.register("registrars", RegistrarViewSet)
-router.register("contacts", RegistrationContactViewSet)
+router.register("contacts", ContactViewSet)
 router.register("zonetemplates", ZoneTemplateViewSet)
 router.register("recordtemplates", RecordTemplateViewSet)
 

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/api/views.py

@@ -1,8 +1,9 @@
 from rest_framework import serializers
+from rest_framework.decorators import action
+from rest_framework.response import Response
 from rest_framework.routers import APIRootView
 
 from ipam.models import Prefix
-from ipam.filtersets import PrefixFilterSet
 
 from netbox.api.viewsets import NetBoxModelViewSet
 
@@ -12,7 +13,7 @@ from netbox_dns.api.serializers import (
     NameServerSerializer,
     RecordSerializer,
     RegistrarSerializer,
-    RegistrationContactSerializer,
+    ContactSerializer,
     ZoneTemplateSerializer,
     RecordTemplateSerializer,
     PrefixSerializer,
@@ -23,7 +24,7 @@ from netbox_dns.filtersets import (
     NameServerFilterSet,
     RecordFilterSet,
     RegistrarFilterSet,
-    RegistrationContactFilterSet,
+    ContactFilterSet,
     ZoneTemplateFilterSet,
     RecordTemplateFilterSet,
 )
@@ -33,7 +34,7 @@ from netbox_dns.models import (
     NameServer,
     Record,
     Registrar,
-    RegistrationContact,
+    Contact,
     ZoneTemplate,
     RecordTemplate,
 )
@@ -49,6 +50,12 @@ class ViewViewSet(NetBoxModelViewSet):
     serializer_class = ViewSerializer
     filterset_class = ViewFilterSet
 
+    @action(detail=True, methods=["get"])
+    def views(self, request, pk=None):
+        views = View.objects.filter(zone=pk)
+        serializer = ViewSerializer(views, many=True, context={"request": request})
+        return Response(serializer.data)
+
 
 class ZoneViewSet(NetBoxModelViewSet):
     queryset = Zone.objects.prefetch_related(
@@ -62,12 +69,32 @@ class ZoneViewSet(NetBoxModelViewSet):
     serializer_class = ZoneSerializer
     filterset_class = ZoneFilterSet
 
+    @action(detail=True, methods=["get"])
+    def records(self, request, pk=None):
+        records = Record.objects.filter(zone=pk)
+        serializer = RecordSerializer(records, many=True, context={"request": request})
+        return Response(serializer.data)
+
+    @action(detail=True, methods=["get"])
+    def nameservers(self, request, pk=None):
+        nameservers = NameServer.objects.filter(zones__id=pk)
+        serializer = NameServerSerializer(
+            nameservers, many=True, context={"request": request}
+        )
+        return Response(serializer.data)
+
 
 class NameServerViewSet(NetBoxModelViewSet):
     queryset = NameServer.objects.prefetch_related("zones", "tenant")
     serializer_class = NameServerSerializer
     filterset_class = NameServerFilterSet
 
+    @action(detail=True, methods=["get"])
+    def zones(self, request, pk=None):
+        zones = Zone.objects.filter(nameservers__id=pk)
+        serializer = ZoneSerializer(zones, many=True, context={"request": request})
+        return Response(serializer.data)
+
 
 class RecordViewSet(NetBoxModelViewSet):
     queryset = Record.objects.all().prefetch_related("zone", "zone__view", "tenant")
@@ -112,10 +139,10 @@ class RegistrarViewSet(NetBoxModelViewSet):
     filterset_class = RegistrarFilterSet
 
 
-class RegistrationContactViewSet(NetBoxModelViewSet):
-    queryset = RegistrationContact.objects.all()
-    serializer_class = RegistrationContactSerializer
-    filterset_class = RegistrationContactFilterSet
+class ContactViewSet(NetBoxModelViewSet):
+    queryset = Contact.objects.all()
+    serializer_class = ContactSerializer
+    filterset_class = ContactFilterSet
 
 
 class ZoneTemplateViewSet(NetBoxModelViewSet):
@@ -133,4 +160,3 @@ class RecordTemplateViewSet(NetBoxModelViewSet):
 class PrefixViewSet(NetBoxModelViewSet):
     queryset = Prefix.objects.all()
     serializer_class = PrefixSerializer
-    filterset_class = PrefixFilterSet

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/fields/ipam.py

@@ -6,6 +6,9 @@ __all__ = ("PrefixDynamicModelMultipleChoiceField",)
 
 
 class PrefixDynamicModelMultipleChoiceField(DynamicModelMultipleChoiceField):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
     widget = APISelectMultiple(api_url="/api/plugins/netbox-dns/prefixes")
 
     def label_from_instance(self, obj):

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/filtersets/__init__.py

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

netbox_plugin_dns-1.1.0/netbox_dns/filtersets/registration_contact.py → netbox_plugin_dns-1.1.0b1/netbox_dns/filtersets/contact.py

@@ -2,15 +2,15 @@ from django.db.models import Q
 
 from netbox.filtersets import NetBoxModelFilterSet
 
-from netbox_dns.models import RegistrationContact
+from netbox_dns.models import Contact
 
 
-__all__ = ("RegistrationContactFilterSet",)
+__all__ = ("ContactFilterSet",)
 
 
-class RegistrationContactFilterSet(NetBoxModelFilterSet):
+class ContactFilterSet(NetBoxModelFilterSet):
     class Meta:
-        model = RegistrationContact
+        model = Contact
         fields = (
             "id",
             "name",

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/filtersets/record.py

@@ -121,7 +121,7 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         if not value.strip():
             return queryset
         qs_filter = (
-            Q(fqdn__icontains=value)
+            Q(name__icontains=value)
             | Q(value__icontains=value)
             | Q(zone__name__icontains=value)
         )

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/filtersets/zone.py

@@ -7,7 +7,7 @@ from netbox.filtersets import NetBoxModelFilterSet
 from tenancy.filtersets import TenancyFilterSet
 from utilities.filters import MultiValueCharFilter
 
-from netbox_dns.models import View, Zone, Registrar, RegistrationContact, NameServer
+from netbox_dns.models import View, Zone, Registrar, Contact, NameServer
 from netbox_dns.choices import ZoneStatusChoices
 
 
@@ -95,44 +95,44 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label="Registrar",
     )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         label="Registrant ID",
     )
     registrant = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         field_name="registrant__contact_id",
         to_field_name="contact_id",
         label="Registrant",
     )
     admin_c_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
-        label="Administrative RegistrationContact ID",
+        queryset=Contact.objects.all(),
+        label="Administrative Contact ID",
     )
     admin_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.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",
+        queryset=Contact.objects.all(),
+        label="Technical Contact ID",
     )
     tech_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.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",
+        queryset=Contact.objects.all(),
+        label="Billing Contact ID",
     )
     billing_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.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",

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/filtersets/zone_template.py

@@ -9,7 +9,7 @@ from netbox_dns.models import (
     ZoneTemplate,
     RecordTemplate,
     Registrar,
-    RegistrationContact,
+    Contact,
     NameServer,
 )
 
@@ -53,44 +53,44 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label="Registrar",
     )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         label="Registrant ID",
     )
     registrant = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         field_name="registrant__contact_id",
         to_field_name="contact_id",
         label="Registrant",
     )
     admin_c_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
-        label="Administrative RegistrationContact ID",
+        queryset=Contact.objects.all(),
+        label="Administrative Contact ID",
     )
     admin_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.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",
+        queryset=Contact.objects.all(),
+        label="Technical Contact ID",
     )
     tech_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.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",
+        queryset=Contact.objects.all(),
+        label="Billing Contact ID",
     )
     billing_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=RegistrationContact.objects.all(),
+        queryset=Contact.objects.all(),
         field_name="billing_c__contact_id",
         to_field_name="contact_id",
-        label="Billing RegistrationContact",
+        label="Billing Contact",
     )
 
     class Meta:

{netbox_plugin_dns-1.1.0 → netbox_plugin_dns-1.1.0b1}/netbox_dns/forms/__init__.py

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

netbox_plugin_dns-1.1.0/netbox_dns/forms/registration_contact.py → netbox_plugin_dns-1.1.0b1/netbox_dns/forms/contact.py

@@ -9,18 +9,18 @@ from netbox.forms import (
 from utilities.forms.fields import TagFilterField
 from utilities.forms.rendering import FieldSet
 
-from netbox_dns.models import RegistrationContact
+from netbox_dns.models import Contact
 
 
 __all__ = (
-    "RegistrationContactForm",
-    "RegistrationContactFilterForm",
-    "RegistrationContactImportForm",
-    "RegistrationContactBulkEditForm",
+    "ContactForm",
+    "ContactFilterForm",
+    "ContactImportForm",
+    "ContactBulkEditForm",
 )
 
 
-class RegistrationContactForm(NetBoxModelForm):
+class ContactForm(NetBoxModelForm):
     fieldsets = (
         FieldSet(
             "name",
@@ -37,13 +37,13 @@ class RegistrationContactForm(NetBoxModelForm):
             "fax",
             "fax_ext",
             "email",
-            name="RegistrationContact",
+            name="Contact",
         ),
         FieldSet("tags", name="Tags"),
     )
 
     class Meta:
-        model = RegistrationContact
+        model = Contact
         fields = (
             "name",
             "description",
@@ -63,8 +63,8 @@ class RegistrationContactForm(NetBoxModelForm):
         )
 
 
-class RegistrationContactFilterForm(NetBoxModelFilterSetForm):
-    model = RegistrationContact
+class ContactFilterForm(NetBoxModelFilterSetForm):
+    model = Contact
 
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
@@ -89,7 +89,7 @@ class RegistrationContactFilterForm(NetBoxModelFilterSetForm):
     )
     contact_id = forms.CharField(
         required=False,
-        label="RegistrationContact ID",
+        label="Contact ID",
     )
     organization = forms.CharField(
         required=False,
@@ -128,12 +128,12 @@ class RegistrationContactFilterForm(NetBoxModelFilterSetForm):
     email = forms.CharField(
         required=False,
     )
-    tag = TagFilterField(RegistrationContact)
+    tag = TagFilterField(Contact)
 
 
-class RegistrationContactImportForm(NetBoxModelImportForm):
+class ContactImportForm(NetBoxModelImportForm):
     class Meta:
-        model = RegistrationContact
+        model = Contact
         fields = (
             "name",
             "description",
@@ -153,8 +153,8 @@ class RegistrationContactImportForm(NetBoxModelImportForm):
         )
 
 
-class RegistrationContactBulkEditForm(NetBoxModelBulkEditForm):
-    model = RegistrationContact
+class ContactBulkEditForm(NetBoxModelBulkEditForm):
+    model = Contact
 
     name = forms.CharField(
         required=False,