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

netbox_dns/templates/netbox_dns/zone.html

@@ -9,95 +9,99 @@
             <h5 class="card-header">
                 Zone
             </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">Name</th>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    {% if unicode_name %}
-                        <tr>
-                            <th scope="row">IDN</th>
-                            <td>{{ unicode_name }}</td>
-                        </tr>
-                    {% endif %}
-                    {% if object.view %}
-                    <tr>
-                        <th scope="row">View</th>
-                        <td>
-                            <a href="{% url 'plugins:netbox_dns:view' pk=object.view.pk %}">
-                                {{ object.view }}
-                            </a>
-                        </td>
-                    </tr>
-                    {% endif %}
-                    <tr>
-                        <th scope="row">Tenant</th>
-                        <td>
-                            {% if object.tenant.group %}
-                                {{ object.tenant.group|linkify }} /
-                            {% endif %}
-                            {{ object.tenant|linkify|placeholder }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Status</th>
-                        <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Nameservers</th>
-                        <td>
-                            <table>
-                                {% for nameserver in object.nameservers.all %}
-                                <tr>
-                                    <td>
-                                        <a href="{% url 'plugins:netbox_dns:nameserver' pk=nameserver.pk %}">
-                                            {{ nameserver }}
-                                        </a>
-                                    </td>
-                                </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
-                    {% if nameserver_warnings %}
-                    <tr>
-                        <th class="text-warning" scope="row">Warnings</th>
-                        <td>
-                            <table>
-                                {% for warning in nameserver_warnings %}
-                                <tr>
-                                    <td class="text-warning">{{ warning }}</td>
-                                </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
-                    </tr>
-                    {% endif %}
-                    {% if nameserver_errors %}
-                    <tr>
-                        <th class="text-danger" scope="row">Errors</th>
-                        <td>
-                            <table>
-                                {% for error in nameserver_errors %}
-                                <tr>
-                                    <td class="text-danger">{{ error }}</td>
-                                </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
-                    </tr>
-                    {% endif %}
-                    </tr>
-                    <tr>
-                        <th scope="row">Default TTL</th>
-                        <td>{{ object.default_ttl }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Description</th>
-                        <td>{{ object.description }}</td>
-                    </tr>
-                </table>
-            </div>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">Name</th>
+                    <td>{{ object.name }}</td>
+                </tr>
+                {% if unicode_name %}
+                    <tr>
+                        <th scope="row">IDN</th>
+                        <td>{{ unicode_name }}</td>
+                    </tr>
+                {% endif %}
+                {% if object.view %}
+                <tr>
+                    <th scope="row">View</th>
+                    <td>
+                        <a href="{% url 'plugins:netbox_dns:view' pk=object.view.pk %}">
+                            {{ object.view }}
+                        </a>
+                    </td>
+                </tr>
+                {% endif %}
+                {% if object.description %}
+                <tr>
+                    <th scope="row">Description</th>
+                    <td style="word-break:break-all;">{{ object.description }}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                    <th scope="row">Tenant</th>
+                    <td>
+                        {% if object.tenant.group %}
+                            {{ object.tenant.group|linkify }} /
+                        {% endif %}
+                        {{ object.tenant|linkify|placeholder }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Status</th>
+                    <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Nameservers</th>
+                    <td>
+                        <table>
+                            {% for nameserver in object.nameservers.all %}
+                            <tr>
+                                <td>
+                                    <a href="{% url 'plugins:netbox_dns:nameserver' pk=nameserver.pk %}">
+                                        {{ nameserver }}
+                                    </a>
+                                </td>
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </td>
+                {% if nameserver_warnings %}
+                <tr>
+                    <th class="text-warning" scope="row">Warnings</th>
+                    <td>
+                        <table>
+                            {% for warning in nameserver_warnings %}
+                            <tr>
+                                <td class="text-warning">{{ warning }}</td>
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </td>
+                </tr>
+                {% endif %}
+                {% if nameserver_errors %}
+                <tr>
+                    <th class="text-danger" scope="row">Errors</th>
+                    <td>
+                        <table>
+                            {% for error in nameserver_errors %}
+                            <tr>
+                                <td class="text-danger">{{ error }}</td>
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </td>
+                </tr>
+                {% endif %}
+                </tr>
+                <tr>
+                    <th scope="row">Default TTL</th>
+                    <td>{{ object.default_ttl }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Description</th>
+                    <td>{{ object.description }}</td>
+                </tr>
+            </table>
         </div>
 
         {% include 'inc/panels/tags.html' %}
@@ -106,70 +110,67 @@
     <div class="col col-md-6">
         <div class="card">
             <h5 class="card-header">Zone SOA</h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">TTL</th>
-                        <td>{{ object.soa_ttl }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Primary Nameserver</th>
-                        <td><a href="{% url 'plugins:netbox_dns:nameserver' pk=object.soa_mname.pk %}">{{ object.soa_mname }}</a></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Responsible</th>
-                        <td>{{ object.soa_rname }}</td>
-                    </tr>
-                    {% if object.soa_serial_auto %}
-                    <tr>
-                        <th scope="row">Serial (auto-generated)</th>
-                        <td>{{ object.soa_serial }}</td>
-                    </tr>
-                    {% else %}
-                    <tr>
-                        <th scope="row">Serial</th>
-                        <td>{{ object.soa_serial }}</td>
-                    </tr>
-                    {% endif %}
-                    <tr>
-                        <th scope="row">Refresh</th>
-                        <td>{{ object.soa_refresh }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Retry</th>
-                        <td>{{ object.soa_retry }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Expire</th>
-                        <td>{{ object.soa_expire }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Minimum TTL</th>
-                        <td>{{ object.soa_minimum }}</td>
-                    </tr>
-                </table>
-            </div>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">TTL</th>
+                    <td>{{ object.soa_ttl }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Primary Nameserver</th>
+                    <td><a href="{% url 'plugins:netbox_dns:nameserver' pk=object.soa_mname.pk %}">{{ object.soa_mname }}</a></td>
+                </tr>
+                <tr>
+                    <th scope="row">Responsible</th>
+                    <td>{{ object.soa_rname }}</td>
+                </tr>
+                {% if object.soa_serial_auto %}
+                <tr>
+                    <th scope="row">Serial (auto-generated)</th>
+                    <td>{{ object.soa_serial }}</td>
+                </tr>
+                {% else %}
+                <tr>
+                    <th scope="row">Serial</th>
+                    <td>{{ object.soa_serial }}</td>
+                </tr>
+                {% endif %}
+                <tr>
+                    <th scope="row">Refresh</th>
+                    <td>{{ object.soa_refresh }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Retry</th>
+                    <td>{{ object.soa_retry }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Expire</th>
+                    <td>{{ object.soa_expire }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Minimum TTL</th>
+                    <td>{{ object.soa_minimum }}</td>
+                </tr>
+            </table>
         </div>
         {% if object.rfc2317_prefix %}
         <div class="card">
             <h5 class="card-header">RFC2317</h5>
-            <div class="card-body">
-                <table class="table table-hover soa-table">
-                    <tr>
-                        <th scope="row">Prefix</th>
-                        <td>{{ object.rfc2317_prefix }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Parent Managed</th>
-                        <td>{% checkmark object.rfc2317_parent_managed %}</td>
-                    </tr>
-                    {% if object.rfc2317_parent_managed %}
-                    <tr>
-                        <th scope="row">Parent Zone</th>
-                        <td><a href="{% url 'plugins:netbox_dns:zone' pk=object.rfc2317_parent_zone.pk %}">{{ object.rfc2317_parent_zone }}</a></td>
-                    </tr>
-                    {% endif %}
-                </table>
+            <table class="table table-hover soa-table">
+                <tr>
+                    <th scope="row">Prefix</th>
+                    <td>{{ object.rfc2317_prefix }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Parent Managed</th>
+                    <td>{% checkmark object.rfc2317_parent_managed %}</td>
+                </tr>
+                {% if object.rfc2317_parent_managed %}
+                <tr>
+                    <th scope="row">Parent Zone</th>
+                    <td><a href="{% url 'plugins:netbox_dns:zone' pk=object.rfc2317_parent_zone.pk %}">{{ object.rfc2317_parent_zone }}</a></td>
+                </tr>
+                {% endif %}
+            </table>
             </div>
         </div>
         {% endif %}

netbox_dns/utilities/__init__.py

@@ -4,12 +4,7 @@ from dns import name as dns_name
 from dns.exception import DNSException
 from netaddr import IPNetwork, AddrFormatError
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 
 class NameFormatError(Exception):

netbox_dns/utilities/ipam_coupling.py

@@ -3,12 +3,7 @@ from utilities.permissions import resolve_permission
 
 from netbox_dns.models import Record, RecordTypeChoices, RecordStatusChoices
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 
 class DNSPermissionDenied(Exception):
@@ -69,7 +64,7 @@ def new_address_record(instance):
         status=address_record_status(instance),
         type=address_record_type(instance),
         value=str(instance.address.ip),
-        ipam_ip_address_id=instance.id,
+        ipam_ip_address_id=instance.pk,
         managed=True,
     )
 

netbox_dns/validators/dns_name.py

@@ -2,12 +2,7 @@ import re
 
 from django.core.exceptions import ValidationError
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 LABEL = r"[a-z0-9][a-z0-9-]*(?<!-)"
 TOLERANT_LABEL = r"[a-z0-9][a-z0-9-_]*(?<![-_])"
@@ -26,7 +21,7 @@ def validate_fqdn(name):
         regex = rf"^(\*|{LABEL})(\.{LABEL})+\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"Not a valid fully qualified DNS host name")
+        raise ValidationError("Not a valid fully qualified DNS host name")
 
 
 def validate_extended_hostname(name, tolerate_leading_underscores=False):
@@ -41,7 +36,7 @@ def validate_extended_hostname(name, tolerate_leading_underscores=False):
         regex = rf"^([*@]|(\*\.)?{LABEL}(\.{LABEL})*\.?)$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"Not a valid DNS host name")
+        raise ValidationError("Not a valid DNS host name")
 
 
 def validate_domain_name(name):
@@ -54,4 +49,4 @@ def validate_domain_name(name):
         regex = rf"^{LABEL}(\.{LABEL})*\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or has_invalid_double_dash(name):
-        raise ValidationError(f"Not a valid DNS domain name")
+        raise ValidationError("Not a valid DNS domain name")

netbox_dns/validators/rfc2317.py

@@ -10,9 +10,9 @@ def validate_prefix(prefix):
 
 def validate_ipv4(prefix):
     if prefix.version != 4:
-        raise ValidationError(f"RFC2317 requires an IPv4 prefix.")
+        raise ValidationError("RFC2317 requires an IPv4 prefix.")
 
 
 def validate_rfc2317(prefix):
     if prefix.prefixlen <= 24:
-        raise ValidationError(f"RFC2317 requires at least 25 bit prefix length.")
+        raise ValidationError("RFC2317 requires at least 25 bit prefix length.")

netbox_dns/views/contact.py

@@ -5,7 +5,7 @@ from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
 from netbox_dns.models import Contact, Zone
-from netbox_dns.filters import ContactFilter, ZoneFilter
+from netbox_dns.filtersets import ContactFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
     ContactForm,
     ContactFilterForm,
@@ -22,7 +22,7 @@ class ContactView(generic.ObjectView):
 class ContactListView(generic.ObjectListView):
     queryset = Contact.objects.all()
     table = ContactTable
-    filterset = ContactFilter
+    filterset = ContactFilterSet
     filterset_form = ContactFilterForm
 
 
@@ -46,7 +46,7 @@ class ContactBulkImportView(generic.BulkImportView):
 
 class ContactBulkEditView(generic.BulkEditView):
     queryset = Contact.objects.all()
-    filterset = ContactFilter
+    filterset = ContactFilterSet
     table = ContactTable
     form = ContactBulkEditForm
 
@@ -63,7 +63,7 @@ class ContactZoneListView(generic.ObjectChildrenView):
     )
     child_model = Zone
     table = ZoneTable
-    filterset = ZoneFilter
+    filterset = ZoneFilterSet
     template_name = "netbox_dns/zone/child.html"
     hide_if_empty = True
 

netbox_dns/views/nameserver.py

@@ -3,7 +3,7 @@ from dns import name as dns_name
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
-from netbox_dns.filters import NameServerFilter, ZoneFilter
+from netbox_dns.filtersets import NameServerFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
     NameServerImportForm,
     NameServerFilterForm,
@@ -16,7 +16,7 @@ from netbox_dns.tables import NameServerTable, ZoneTable
 
 class NameServerListView(generic.ObjectListView):
     queryset = NameServer.objects.all()
-    filterset = NameServerFilter
+    filterset = NameServerFilterSet
     filterset_form = NameServerFilterForm
     table = NameServerTable
 
@@ -54,7 +54,7 @@ class NameServerBulkImportView(generic.BulkImportView):
 
 class NameServerBulkEditView(generic.BulkEditView):
     queryset = NameServer.objects.all()
-    filterset = NameServerFilter
+    filterset = NameServerFilterSet
     table = NameServerTable
     form = NameServerBulkEditForm
 
@@ -69,7 +69,7 @@ class NameServerZoneListView(generic.ObjectChildrenView):
     queryset = NameServer.objects.all().prefetch_related("zones")
     child_model = Zone
     table = ZoneTable
-    filterset = ZoneFilter
+    filterset = ZoneFilterSet
     template_name = "netbox_dns/zone/child.html"
     hide_if_empty = True
 
@@ -89,7 +89,7 @@ class NameServerSOAZoneListView(generic.ObjectChildrenView):
     queryset = NameServer.objects.all().prefetch_related("zones_soa")
     child_model = Zone
     table = ZoneTable
-    filterset = ZoneFilter
+    filterset = ZoneFilterSet
     template_name = "netbox_dns/zone/child.html"
     hide_if_empty = True
 

netbox_dns/views/record.py

@@ -5,7 +5,7 @@ from django.db.models.functions import Length
 
 from netbox.views import generic
 
-from netbox_dns.filters import RecordFilter
+from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
     RecordImportForm,
     RecordFilterForm,
@@ -21,7 +21,7 @@ class RecordListView(generic.ObjectListView):
     queryset = Record.objects.filter(managed=False).prefetch_related(
         "zone", "ptr_record"
     )
-    filterset = RecordFilter
+    filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = RecordTable
 
@@ -30,10 +30,10 @@ class ManagedRecordListView(generic.ObjectListView):
     queryset = Record.objects.filter(managed=True).prefetch_related(
         "zone", "address_record"
     )
-    filterset = RecordFilter
+    filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable
-    actions = ("export",)
+    actions = {"export": {"view"}}
     template_name = "netbox_dns/record/managed.html"
 
 
@@ -41,15 +41,22 @@ class RecordView(generic.ObjectView):
     queryset = Record.objects.all().prefetch_related("zone", "ptr_record")
 
     def get_value_records(self, instance):
-        view_filter = (
-            Q(zone__view__isnull=True)
-            if instance.zone.view is None
-            else Q(zone__view=instance.zone.view)
-        )
-
         value_fqdn = dns_name.from_text(instance.value_fqdn)
+        value_zone_names = [
+            value_fqdn.split(length)[1].to_text().rstrip(".")
+            for length in range(2, len(value_fqdn) + 1)
+        ]
+
+        value_zone = (
+            Zone.objects.filter(instance.zone.view_filter, name__in=value_zone_names)
+            .order_by(Length("name").desc())
+            .first()
+        )
+        if not value_zone:
+            return None
 
-        cname_targets = Record.objects.filter(view_filter, fqdn=value_fqdn)
+        value_name = value_fqdn.relativize(dns_name.from_text(value_zone.name))
+        cname_targets = Record.objects.filter(zone=value_zone, name=value_name)
 
         if cname_targets:
             return RelatedRecordTable(
@@ -142,7 +149,7 @@ class RecordBulkImportView(generic.BulkImportView):
 
 class RecordBulkEditView(generic.BulkEditView):
     queryset = Record.objects.filter(managed=False).prefetch_related("zone")
-    filterset = RecordFilter
+    filterset = RecordFilterSet
     table = RecordTable
     form = RecordBulkEditForm
 

netbox_dns/views/registrar.py

@@ -3,7 +3,7 @@ from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
 from netbox_dns.models import Registrar, Zone
-from netbox_dns.filters import RegistrarFilter, ZoneFilter
+from netbox_dns.filtersets import RegistrarFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
     RegistrarForm,
     RegistrarFilterForm,
@@ -20,7 +20,7 @@ class RegistrarView(generic.ObjectView):
 class RegistrarListView(generic.ObjectListView):
     queryset = Registrar.objects.all()
     table = RegistrarTable
-    filterset = RegistrarFilter
+    filterset = RegistrarFilterSet
     filterset_form = RegistrarFilterForm
 
 
@@ -44,7 +44,7 @@ class RegistrarBulkImportView(generic.BulkImportView):
 
 class RegistrarBulkEditView(generic.BulkEditView):
     queryset = Registrar.objects.all()
-    filterset = RegistrarFilter
+    filterset = RegistrarFilterSet
     table = RegistrarTable
     form = RegistrarBulkEditForm
 
@@ -59,7 +59,7 @@ class RegistrarZoneListView(generic.ObjectChildrenView):
     queryset = Registrar.objects.all().prefetch_related("zone_set")
     child_model = Zone
     table = ZoneTable
-    filterset = ZoneFilter
+    filterset = ZoneFilterSet
     template_name = "netbox_dns/zone/child.html"
     hide_if_empty = True
 

netbox_dns/views/view.py

@@ -3,7 +3,7 @@ from utilities.views import ViewTab, register_model_view
 from netbox.views import generic
 
 from netbox_dns.models import View, Zone
-from netbox_dns.filters import ViewFilter, ZoneFilter
+from netbox_dns.filtersets import ViewFilterSet, ZoneFilterSet
 from netbox_dns.forms import ViewForm, ViewFilterForm, ViewImportForm, ViewBulkEditForm
 from netbox_dns.tables import ViewTable, ZoneTable
 
@@ -15,7 +15,7 @@ class ViewView(generic.ObjectView):
 class ViewListView(generic.ObjectListView):
     queryset = View.objects.all()
     table = ViewTable
-    filterset = ViewFilter
+    filterset = ViewFilterSet
     filterset_form = ViewFilterForm
 
 
@@ -39,7 +39,7 @@ class ViewBulkImportView(generic.BulkImportView):
 
 class ViewBulkEditView(generic.BulkEditView):
     queryset = View.objects.all()
-    filterset = ViewFilter
+    filterset = ViewFilterSet
     table = ViewTable
     form = ViewBulkEditForm
 
@@ -54,7 +54,7 @@ class ViewZoneListView(generic.ObjectChildrenView):
     queryset = View.objects.all().prefetch_related("zone_set")
     child_model = Zone
     table = ZoneTable
-    filterset = ZoneFilter
+    filterset = ZoneFilterSet
     template_name = "netbox_dns/zone/child.html"
     hide_if_empty = True