netbox-plugin-dns 0.22.8__tar.gz → 0.22.9__tar.gz

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.22.8
+Version: 0.22.9
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/__init__.py

@@ -10,7 +10,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.22.8"
+__version__ = "0.22.9"
 
 
 class DNSConfig(PluginConfig):

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/management/commands/cleanup_rrset_ttl.py

@@ -34,7 +34,7 @@ class Command(BaseCommand):
         ttl_records = (
             Record.objects.filter(ttl__isnull=False)
             .exclude(type=RecordTypeChoices.SOA)
-            .exclude(type=RecordTypeChoices.PTR, maanged=True)
+            .exclude(type=RecordTypeChoices.PTR, managed=True)
         )
         for record in ttl_records:
             records = Record.objects.filter(

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/models/nameserver.py

@@ -53,7 +53,7 @@ class NameServer(NetBoxModel):
     def get_absolute_url(self):
         return reverse("plugins:netbox_dns:nameserver", kwargs={"pk": self.pk})
 
-    def clean(self):
+    def clean(self, *args, **kwargs):
         try:
             self.name = normalize_name(self.name)
         except NameFormatError as exc:
@@ -72,6 +72,8 @@ class NameServer(NetBoxModel):
                 }
             ) from None
 
+        super().clean(*args, **kwargs)
+
     def save(self, *args, **kwargs):
         self.full_clean()
 

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/models/record.py

@@ -699,6 +699,8 @@ class Record(NetBoxModel):
                     }
                 ) from None
 
+        super().clean(*args, **kwargs)
+
     def save(
         self,
         *args,
@@ -758,7 +760,8 @@ class Record(NetBoxModel):
 class RecordIndex(SearchIndex):
     model = Record
     fields = (
-        ("name", 100),
+        ("fqdn", 100),
+        ("name", 120),
         ("value", 150),
         ("zone", 200),
         ("type", 200),

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/templates/netbox_dns/record.html

@@ -53,7 +53,7 @@
                         <td><a href="{% url 'plugins:netbox_dns:zone_records' pk=object.zone.pk %}">{{ object.zone }}</a></td>
                         {% endif %}
                     </tr>
-                    {% if not object.managed %}
+                    {% if object.tenant %}
                     <tr>
                         <th scope="row">Tenant</th>
                         <td>

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/netbox_dns/views/record.py

@@ -41,22 +41,15 @@ class RecordView(generic.ObjectView):
     queryset = Record.objects.all().prefetch_related("zone", "ptr_record")
 
     def get_value_records(self, instance):
-        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()
+        view_filter = (
+            Q(zone__view__isnull=True)
+            if instance.zone.view is None
+            else Q(zone__view=instance.zone.view)
         )
-        if not value_zone:
-            return None
 
-        value_name = value_fqdn.relativize(dns_name.from_text(value_zone.name))
-        cname_targets = Record.objects.filter(zone=value_zone, name=value_name)
+        value_fqdn = dns_name.from_text(instance.value_fqdn)
+
+        cname_targets = Record.objects.filter(view_filter, fqdn=value_fqdn)
 
         if cname_targets:
             return RelatedRecordTable(

{netbox_plugin_dns-0.22.8 → netbox_plugin_dns-0.22.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.22.8"
+version = "0.22.9"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pete@netbox-dns.org>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"