netbox-plugin-dns 1.1.0b4__tar.gz → 1.1.0b5__tar.gz

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 1.1.0b4
+Version: 1.1.0b5
 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-1.1.0b4 → netbox_plugin_dns-1.1.0b5}/netbox_dns/__init__.py

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

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

@@ -4,6 +4,7 @@ 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
 
@@ -160,3 +161,4 @@ class RecordTemplateViewSet(NetBoxModelViewSet):
 class PrefixViewSet(NetBoxModelViewSet):
     queryset = Prefix.objects.all()
     serializer_class = PrefixSerializer
+    filterset_class = PrefixFilterSet

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

@@ -6,9 +6,6 @@ __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.0b4 → netbox_plugin_dns-1.1.0b5}/netbox_dns/tables/record.py

@@ -1,4 +1,7 @@
 import django_tables2 as tables
+from django_tables2.utils import Accessor
+from django.utils.html import format_html
+
 
 from netbox.tables import (
     NetBoxTable,
@@ -6,11 +9,16 @@ from netbox.tables import (
     TagColumn,
     ActionsColumn,
 )
+from ipam.lookups import Host, Inet
 from tenancy.tables import TenancyColumnsMixin
 
 from netbox_dns.models import Record
 from netbox_dns.utilities import value_to_unicode
 
+import logging
+
+logger = logging.getLogger("netbox_dns")
+
 
 __all__ = (
     "RecordTable",
@@ -100,6 +108,11 @@ class ManagedRecordTable(RecordBaseTable):
         verbose_name="IPAM IP Address",
         linkify=True,
     )
+    related_ip_address = tables.Column(
+        verbose_name="Related IP Address",
+        empty_values=(),
+        orderable=False,
+    )
     actions = ActionsColumn(actions=("changelog",))
 
     class Meta(NetBoxTable.Meta):
@@ -113,6 +126,7 @@ class ManagedRecordTable(RecordBaseTable):
             "unicode_value",
             "address_record",
             "ipam_ip_address",
+            "related_ip_address",
             "active",
         )
         default_columns = (
@@ -124,6 +138,28 @@ class ManagedRecordTable(RecordBaseTable):
             "active",
         )
 
+    def render_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            address = record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            address = record.address_record.ipam_ip_address
+        else:
+            return format_html("—")
+
+        return format_html(f"<a href='{address.get_absolute_url()}'>{address}</a>")
+
+    def value_related_ip_address(self, record):
+        if record.ipam_ip_address is not None:
+            return record.ipam_ip_address
+        elif (
+            hasattr(record, "address_record")
+            and record.address_record.ipam_ip_address is not None
+        ):
+            return record.address_record.ipam_ip_address
+
 
 class RelatedRecordTable(RecordBaseTable):
     actions = ActionsColumn(actions=())

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b5}/netbox_dns/views/record.py

@@ -1,6 +1,10 @@
 from dns import name as dns_name
 
+from django.db.models import F, Q, Case, When, OuterRef, Subquery
+
 from netbox.views import generic
+from ipam.fields import IPAddressField
+from ipam.models import IPAddress
 
 from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
@@ -37,9 +41,7 @@ class RecordListView(generic.ObjectListView):
 
 
 class ManagedRecordListView(generic.ObjectListView):
-    queryset = Record.objects.filter(managed=True).prefetch_related(
-        "zone", "address_record"
-    )
+    queryset = Record.objects.prefetch_related("ipam_ip_address", "address_record")
     filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable

{netbox_plugin_dns-1.1.0b4 → netbox_plugin_dns-1.1.0b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "1.1.0b4"
+version = "1.1.0b5"
 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"