netbox-plugin-dns 0.22.5__py3-none-any.whl → 0.22.6__py3-none-any.whl

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.5"
+__version__ = "0.22.6"
 
 
 class DNSConfig(PluginConfig):
@@ -43,43 +43,6 @@ class DNSConfig(PluginConfig):
     }
     base_url = "netbox-dns"
 
-    def ready(self):
-        #
-        # Check if required custom fields exist for IPAM coupling
-        #
-        if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
-            from extras.models import CustomField
-            from ipam.models import IPAddress
-            from django.contrib.contenttypes.models import ContentType
-
-            try:
-                objtype = ContentType.objects.get_for_model(IPAddress)
-                required_cf = (
-                    "ipaddress_dns_record_name",
-                    "ipaddress_dns_record_ttl",
-                    "ipaddress_dns_record_disable_ptr",
-                    "ipaddress_dns_zone_id",
-                )
-
-                if CustomField.objects.filter(
-                    name__in=required_cf, content_types=objtype
-                ).count() < len(required_cf):
-                    print(
-                        "WARNING: 'feature_ipam_coupling' is enabled, but the required"
-                        " custom fields for IPAM DNS coupling are missing. Please run"
-                        " the Django management command 'setup_coupling' to create the"
-                        " missing custom fields.",
-                        file=sys.stderr,
-                    )
-            except OperationalError as exc:
-                print(
-                    "WARNING: Unable to connect to PostgreSQL, cannot check custom fields"
-                    " for feature_ipam_coupling",
-                    file=sys.stderr,
-                )
-
-        super().ready()
-
 
 #
 # Initialize plugin config

netbox_dns/models/record.py

@@ -241,6 +241,16 @@ class Record(NetBoxModel):
 
         return name.to_text()
 
+    @property
+    def value_fqdn(self):
+        if self.type != RecordTypeChoices.CNAME:
+            return None
+
+        zone = dns_name.from_text(self.zone.name)
+        value_fqdn = dns_name.from_text(self.value, origin=zone)
+
+        return value_fqdn.to_text()
+
     @property
     def address_from_name(self):
         prefix = arpa_to_prefix(self.fqdn)

netbox_dns/templates/netbox_dns/record.html

@@ -112,12 +112,6 @@
                         <td><a href="{% url 'ipam:ipaddress' pk=object.ipam_ip_address.pk %}">{{ object.ipam_ip_address }}</td>
                     </tr>
                     {% endif %}
-                    {% if object.rfc2317_cname_record %}
-                    <tr>
-                        <th scope="row">RFC2317 CNAME Record</th>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=object.rfc2317_cname_record.pk %}">{{ object.rfc2317_cname_record }}</td>
-                    </tr>
-                    {% endif %}
                     <tr>
                         <th scope="row">Status</th>
                         <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
@@ -131,23 +125,13 @@
                 </table>
             </div>
         </div>
-        {% if object.rfc2317_ptr_records.all|length %}
+        {% if cname_target_table and cname_target_table.rows|length > 0 %}
         <div class="card">
-            <h5 class="card-header">RFC2317 Targets</h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th>Address Record</th>
-                        <th>PTR Record</th>
-                    </tr>
-                    {% for record in object.rfc2317_ptr_records.all %}
-                    <tr>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=record.address_record.pk %}">{{ record.address_record }}</td>
-                        <td><a href="{% url 'plugins:netbox_dns:record' pk=record.pk %}">{{ record }}</td>
-                    </td>
-                    {% endfor %}
-                </table>
-            </div>
+            {% include 'inc/panel_table.html' with table=cname_target_table heading='CNAME Targets' %}
+        </div>
+        {% elif cname_table and cname_table.rows|length > 0 %}
+        <div class="card">
+            {% include 'inc/panel_table.html' with table=cname_table heading='CNAMEs' %}
         </div>
         {% endif %}
         {% if not object.managed %}

netbox_dns/views/record.py

@@ -1,5 +1,8 @@
 from dns import name as dns_name
 
+from django.db.models import Q
+from django.db.models.functions import Length
+
 from netbox.views import generic
 
 from netbox_dns.filters import RecordFilter
@@ -9,8 +12,8 @@ from netbox_dns.forms import (
     RecordForm,
     RecordBulkEditForm,
 )
-from netbox_dns.models import Record
-from netbox_dns.tables import RecordTable, ManagedRecordTable
+from netbox_dns.models import Record, RecordTypeChoices, Zone
+from netbox_dns.tables import RecordTable, ManagedRecordTable, RelatedRecordTable
 from netbox_dns.utilities import value_to_unicode
 
 
@@ -37,6 +40,72 @@ class ManagedRecordListView(generic.ObjectListView):
 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))
+        ]
+
+        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
+
+        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(
+                data=cname_targets,
+            )
+
+        return None
+
+    def get_cname_records(self, instance):
+        view_filter = (
+            Q(zone__view__isnull=True)
+            if instance.zone.view is None
+            else Q(zone__view=instance.zone.view)
+        )
+        cname_records = set(
+            Record.objects.filter(
+                view_filter, value=instance.fqdn, type=RecordTypeChoices.CNAME
+            )
+        )
+
+        fqdn = dns_name.from_text(instance.fqdn)
+        parent_zone_names = [
+            fqdn.split(length)[1].to_text().rstrip(".")
+            for length in range(1, len(fqdn))
+        ]
+
+        parent_zones = Zone.objects.filter(
+            instance.zone.view_filter, name__in=parent_zone_names
+        )
+
+        for parent_zone in parent_zones:
+            parent_cname_records = Record.objects.filter(
+                view_filter, type=RecordTypeChoices.CNAME, zone=parent_zone
+            )
+            cname_records = cname_records.union(
+                set(
+                    record
+                    for record in parent_cname_records
+                    if record.value_fqdn == instance.fqdn
+                )
+            )
+
+        if cname_records:
+            return RelatedRecordTable(
+                data=cname_records,
+            )
+
+        return None
+
     def get_extra_context(self, request, instance):
         context = {}
 
@@ -48,6 +117,11 @@ class RecordView(generic.ObjectView):
         if instance.value != unicode_value:
             context["unicode_value"] = unicode_value
 
+        if instance.type == RecordTypeChoices.CNAME:
+            context["cname_target_table"] = self.get_value_records(instance)
+        else:
+            context["cname_table"] = self.get_cname_records(instance)
+
         return context
 
 

{netbox_plugin_dns-0.22.5.dist-info → netbox_plugin_dns-0.22.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.22.5
+Version: 0.22.6
 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.5.dist-info → netbox_plugin_dns-0.22.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=Wnz89UxRISvgUOkm-cZI50tMo6taJh14iZnSb1Wx0L4,2818
+netbox_dns/__init__.py,sha256=_MWBhj_SFYmwsvZRS4rBlGcGT5kgLacAUhdzHZ1gZ5I,1287
 netbox_dns/api/nested_serializers.py,sha256=XB7bcCjVMPYrumJWgRicj06PukQ2UCBjdr84AIUJuVQ,3291
 netbox_dns/api/serializers.py,sha256=H5Vm1O6C4SsxHVzdooYiu5ak3ykxXo-L1mT6ISWVRV8,8183
 netbox_dns/api/urls.py,sha256=R9VmmWtdrjvr35i5d_SfZK2lGn6JzmPuWEKTQlZ8MJo,575
@@ -67,7 +67,7 @@ netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 netbox_dns/models/__init__.py,sha256=Q7UIEe2vGh18AZN4er6CykciwXPQGgUq0L-9718wZqU,182
 netbox_dns/models/contact.py,sha256=Mzj4SR3fczOE96etWjObJElk0RVQetNuXZVtm8sS1h8,2849
 netbox_dns/models/nameserver.py,sha256=SjKUbMRNE3TSDzmxbKFR9b4AfYPS0UPj0QeO7XpwNRk,2941
-netbox_dns/models/record.py,sha256=nOKjaoVuyMVIfwNw_V4hYYd71fcE4UyXThU983KrXaY,23629
+netbox_dns/models/record.py,sha256=KbfSl9Np2kV_qozUB9zgoir3cwutYLvlxPa2q9X-9Jk,23896
 netbox_dns/models/registrar.py,sha256=ByKHeqH5KfswqOLjya8DZExJ1omSKFHMfCjIIYfnwTo,1416
 netbox_dns/models/view.py,sha256=ljs3Q2xQR63ZOSyja5H7DEdFbm7MX2ZjlR6uNVrAsVo,920
 netbox_dns/models/zone.py,sha256=Ek7Jui3AldNHVAHowbQhC47QoXv0IgkhLzFziN14UUI,26333
@@ -86,7 +86,7 @@ netbox_dns/templates/netbox_dns/contact.html,sha256=3qHGChgLYfqUgO3_z9jQ-lFIGS0Z
 netbox_dns/templates/netbox_dns/nameserver.html,sha256=3AJVbsuhKg4Jy74rlvwrGSHd_IoDRdLT_XuK4EH3Djg,1623
 netbox_dns/templates/netbox_dns/record/managed.html,sha256=G6LPG1koUGuzUiwYdv1okdVa4sKaofiQegDBnsFL0kA,89
 netbox_dns/templates/netbox_dns/record/related.html,sha256=Aqor8uGcuHQTHjlX-Xmni2Yp4N7lOBrMOqQiszrQOC0,742
-netbox_dns/templates/netbox_dns/record.html,sha256=1XOp9Rf7KiV736RKGh7A8LAYkrfI7veG5SsEhaeMghw,6613
+netbox_dns/templates/netbox_dns/record.html,sha256=jq1kueOd5EN1myZt8RbXl4rjoTuxWezBnVv36i74QC8,5835
 netbox_dns/templates/netbox_dns/registrar.html,sha256=rSShbH68nP0r8EUHn0-TZOsUj6pg7hmfvM7h2tqouUA,2130
 netbox_dns/templates/netbox_dns/related_dns_objects.html,sha256=KSzlnw1cStrJa3poKkwrt_ycIH0oH0STWIHRNy3ks4g,806
 netbox_dns/templates/netbox_dns/view.html,sha256=_lDjd2xY3upfGpNpemXXMzgsaKZlX3-PzPPAdYkIjvs,1350
@@ -106,11 +106,11 @@ netbox_dns/validators/rfc2317.py,sha256=bgqDwdqwpf5d1mt24Wrr8z8t2IYbt5RovNr6l2nv
 netbox_dns/views/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/views/contact.py,sha256=6-oCfK98-submcUTmi0ejw7QBscNn3S9bnS0oUTXOaY,2235
 netbox_dns/views/nameserver.py,sha256=Wa8CQ19P5uPNLMIYkj_U82wmwdp5gZoBWZnOR4ZExa0,2990
-netbox_dns/views/record.py,sha256=2xzZnCWmCZIyEVjQfYo0rByhBNItPxNFiehOwDl8U6w,2507
+netbox_dns/views/record.py,sha256=p6TOV2dGg5uNPtk2pSqLzMRXpgC-fazpwYe2mIRSTt8,4896
 netbox_dns/views/registrar.py,sha256=aznSKt1L5tILMLGgcZiBR7u7B8rNl-jM1B2-N0fTeK8,2072
 netbox_dns/views/view.py,sha256=uUvtlNEh5MYoEALvWWaCOqj_Zj8dpGOL2PUyg-UPfEA,1895
 netbox_dns/views/zone.py,sha256=SyttTAgrPPzf1jIT1B4RexCLdXYjSmPIZsefO_zog1Q,4587
-netbox_plugin_dns-0.22.5.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-0.22.5.dist-info/METADATA,sha256=U6WLJ-pstL29t54fKW1LAJMkq8r-rtSR8AtutZqxnHg,4572
-netbox_plugin_dns-0.22.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-netbox_plugin_dns-0.22.5.dist-info/RECORD,,
+netbox_plugin_dns-0.22.6.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
+netbox_plugin_dns-0.22.6.dist-info/METADATA,sha256=v4cYHLNbhWBpdmkaefeFSQbmIqg5TxJfeI4SJpUsq4M,4572
+netbox_plugin_dns-0.22.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+netbox_plugin_dns-0.22.6.dist-info/RECORD,,