netbox-plugin-dns 1.1.0b6__tar.gz → 1.1.1__tar.gz

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/PKG-INFO

@@ -1,22 +1,18 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b6
+Version: 1.1.1
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
-Home-page: https://github.com/peteeckel/netbox-plugin-dns
-License: MIT
+Author-email: Peter Eckel <pete@netbox-dns.org>
+Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
+Project-URL: Documentation, https://github.com/peteeckel/netbox-plugin-dns/blob/main/docs/using_netbox_dns.md
+Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
+Project-URL: Issues, https://github.com/peteeckel/netbox-plugin-dns/issues
 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: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: dnspython (>=2.6.1,<3.0.0)
-Project-URL: Repository, https://github.com/peteeckel/netbox-plugin-dns
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: dnspython
 
 # NetBox DNS
 The NetBox DNS plugin enables NetBox to manage operational DNS data such as name servers, zones, records and views, as well as registration data for domains. It can automate tasks like creating PTR records, generating zone serial numbers, NS and SOA records, as well as validate names and values values for resource records to ensure zone data is consistent, up-to-date and compliant with to the relevant RFCs.
@@ -34,6 +30,11 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>
 </div>
 
+> [!WARNING]
+> **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
+> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This warning will be updated as soon as the situation is resolved.
+
 ## Objectives
 NetBox DNS is designed to be the 'DNS Source of Truth' analogous to NetBox being the 'Network Source of Truth'.
 
@@ -111,4 +112,3 @@ For further information, please refer to the full documentation: [Using NetBox D
 ## License
 
 MIT
-

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/README.md

@@ -14,6 +14,11 @@ The NetBox DNS plugin enables NetBox to manage operational DNS data such as name
 <a href="https://pepy.tech/project/netbox-plugin-dns"><img alt="Downloads/Month" src="https://static.pepy.tech/badge/netbox-plugin-dns/week"></a>
 </div>
 
+> [!WARNING]
+> **As a result of some issues with NetBox Branching still under investigation, NetBox DNS is currently not compatible with the new NetBox Branching plugin.**
+> This affects multiple aspects of the branching functionality, and currently (netboxlabs-branching-plugin version 0.4.0) there is no workaround. Do not try to use NetBox Branching together with NetBox DNS until these issues are resolved.
+> This warning will be updated as soon as the situation is resolved.
+
 ## Objectives
 NetBox DNS is designed to be the 'DNS Source of Truth' analogous to NetBox being the 'Network Source of Truth'.
 

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/netbox_dns/__init__.py

@@ -5,7 +5,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices
 
-__version__ = "1.1.0b6"
+__version__ = "1.1.1"
 
 
 class DNSConfig(PluginConfig):

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

@@ -59,6 +59,22 @@ 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"
@@ -86,6 +102,7 @@ class NestedRecordSerializer(WritableNestedSerializer):
             "status",
             "ttl",
             "zone",
+            "managed",
             "active",
         ]
 
@@ -109,19 +126,3 @@ 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.0b6 → netbox_plugin_dns-1.1.1}/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.0b6 → netbox_plugin_dns-1.1.1}/netbox_dns/api/serializers_/record.py

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

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

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

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/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 .contact import ContactSerializer
+from .registration_contact import RegistrationContactSerializer
 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 = ContactSerializer(
+    registrant = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The owner of the domain",
     )
-    admin_c = ContactSerializer(
+    admin_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The administrative contact for the domain",
     )
-    tech_c = ContactSerializer(
+    tech_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The technical contact for the domain",
     )
-    billing_c = ContactSerializer(
+    billing_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/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 .contact import ContactSerializer
+from .registration_contact import RegistrationContactSerializer
 
 
 __all__ = ("ZoneTemplateSerializer",)
@@ -38,28 +38,28 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
         required=False,
         help_text="The registrar the domain is registered with",
     )
-    registrant = ContactSerializer(
+    registrant = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The owner of the domain",
     )
-    admin_c = ContactSerializer(
+    admin_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The administrative contact for the domain",
     )
-    tech_c = ContactSerializer(
+    tech_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,
         required=False,
         help_text="The technical contact for the domain",
     )
-    billing_c = ContactSerializer(
+    billing_c = RegistrationContactSerializer(
         nested=True,
         many=False,
         read_only=False,

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

@@ -7,7 +7,7 @@ from netbox_dns.api.views import (
     NameServerViewSet,
     RecordViewSet,
     RegistrarViewSet,
-    ContactViewSet,
+    RegistrationContactViewSet,
     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", ContactViewSet)
+router.register("contacts", RegistrationContactViewSet)
 router.register("zonetemplates", ZoneTemplateViewSet)
 router.register("recordtemplates", RecordTemplateViewSet)
 

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

@@ -1,6 +1,4 @@
 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
@@ -14,7 +12,7 @@ from netbox_dns.api.serializers import (
     NameServerSerializer,
     RecordSerializer,
     RegistrarSerializer,
-    ContactSerializer,
+    RegistrationContactSerializer,
     ZoneTemplateSerializer,
     RecordTemplateSerializer,
     PrefixSerializer,
@@ -25,7 +23,7 @@ from netbox_dns.filtersets import (
     NameServerFilterSet,
     RecordFilterSet,
     RegistrarFilterSet,
-    ContactFilterSet,
+    RegistrationContactFilterSet,
     ZoneTemplateFilterSet,
     RecordTemplateFilterSet,
 )
@@ -35,7 +33,7 @@ from netbox_dns.models import (
     NameServer,
     Record,
     Registrar,
-    Contact,
+    RegistrationContact,
     ZoneTemplate,
     RecordTemplate,
 )
@@ -51,12 +49,6 @@ 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(
@@ -70,32 +62,12 @@ 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")
@@ -140,10 +112,10 @@ class RegistrarViewSet(NetBoxModelViewSet):
     filterset_class = RegistrarFilterSet
 
 
-class ContactViewSet(NetBoxModelViewSet):
-    queryset = Contact.objects.all()
-    serializer_class = ContactSerializer
-    filterset_class = ContactFilterSet
+class RegistrationContactViewSet(NetBoxModelViewSet):
+    queryset = RegistrationContact.objects.all()
+    serializer_class = RegistrationContactSerializer
+    filterset_class = RegistrationContactFilterSet
 
 
 class ZoneTemplateViewSet(NetBoxModelViewSet):

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

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

netbox_plugin_dns-1.1.0b6/netbox_dns/filtersets/contact.py → netbox_plugin_dns-1.1.1/netbox_dns/filtersets/registration_contact.py

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

{netbox_plugin_dns-1.1.0b6 → netbox_plugin_dns-1.1.1}/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, Contact, NameServer
+from netbox_dns.models import View, Zone, Registrar, RegistrationContact, NameServer
 from netbox_dns.choices import ZoneStatusChoices
 
 
@@ -95,44 +95,44 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label="Registrar",
     )
     registrant_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         label="Registrant ID",
     )
     registrant = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         field_name="registrant__contact_id",
         to_field_name="contact_id",
         label="Registrant",
     )
     admin_c_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
-        label="Administrative Contact ID",
+        queryset=RegistrationContact.objects.all(),
+        label="Administrative RegistrationContact ID",
     )
     admin_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         field_name="admin_c__contact_id",
         to_field_name="contact_id",
-        label="Administrative Contact",
+        label="Administrative RegistrationContact",
     )
     tech_c_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
-        label="Technical Contact ID",
+        queryset=RegistrationContact.objects.all(),
+        label="Technical RegistrationContact ID",
     )
     tech_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         field_name="tech_c__contact_id",
         to_field_name="contact_id",
-        label="Technical Contact",
+        label="Technical RegistrationContact",
     )
     billing_c_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
-        label="Billing Contact ID",
+        queryset=RegistrationContact.objects.all(),
+        label="Billing RegistrationContact ID",
     )
     billing_c = django_filters.ModelMultipleChoiceFilter(
-        queryset=Contact.objects.all(),
+        queryset=RegistrationContact.objects.all(),
         field_name="billing_c__contact_id",
         to_field_name="contact_id",
-        label="Billing Contact",
+        label="Billing RegistrationContact",
     )
     active = django_filters.BooleanFilter(
         label="Zone is active",

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

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

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

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

netbox_plugin_dns-1.1.0b6/netbox_dns/forms/contact.py → netbox_plugin_dns-1.1.1/netbox_dns/forms/registration_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 Contact
+from netbox_dns.models import RegistrationContact
 
 
 __all__ = (
-    "ContactForm",
-    "ContactFilterForm",
-    "ContactImportForm",
-    "ContactBulkEditForm",
+    "RegistrationContactForm",
+    "RegistrationContactFilterForm",
+    "RegistrationContactImportForm",
+    "RegistrationContactBulkEditForm",
 )
 
 
-class ContactForm(NetBoxModelForm):
+class RegistrationContactForm(NetBoxModelForm):
     fieldsets = (
         FieldSet(
             "name",
@@ -37,13 +37,13 @@ class ContactForm(NetBoxModelForm):
             "fax",
             "fax_ext",
             "email",
-            name="Contact",
+            name="RegistrationContact",
         ),
         FieldSet("tags", name="Tags"),
     )
 
     class Meta:
-        model = Contact
+        model = RegistrationContact
         fields = (
             "name",
             "description",
@@ -63,8 +63,8 @@ class ContactForm(NetBoxModelForm):
         )
 
 
-class ContactFilterForm(NetBoxModelFilterSetForm):
-    model = Contact
+class RegistrationContactFilterForm(NetBoxModelFilterSetForm):
+    model = RegistrationContact
 
     fieldsets = (
         FieldSet("q", "filter_id", "tag"),
@@ -89,7 +89,7 @@ class ContactFilterForm(NetBoxModelFilterSetForm):
     )
     contact_id = forms.CharField(
         required=False,
-        label="Contact ID",
+        label="RegistrationContact ID",
     )
     organization = forms.CharField(
         required=False,
@@ -128,12 +128,12 @@ class ContactFilterForm(NetBoxModelFilterSetForm):
     email = forms.CharField(
         required=False,
     )
-    tag = TagFilterField(Contact)
+    tag = TagFilterField(RegistrationContact)
 
 
-class ContactImportForm(NetBoxModelImportForm):
+class RegistrationContactImportForm(NetBoxModelImportForm):
     class Meta:
-        model = Contact
+        model = RegistrationContact
         fields = (
             "name",
             "description",
@@ -153,8 +153,8 @@ class ContactImportForm(NetBoxModelImportForm):
         )
 
 
-class ContactBulkEditForm(NetBoxModelBulkEditForm):
-    model = Contact
+class RegistrationContactBulkEditForm(NetBoxModelBulkEditForm):
+    model = RegistrationContact
 
     name = forms.CharField(
         required=False,