netbox-plugin-dns 1.0.7__py3-none-any.whl → 1.1.0__py3-none-any.whl

netbox_dns/template_content.py

@@ -1,9 +1,13 @@
+from django.conf import settings
+from django.urls import reverse
+
 from netbox.plugins.utils import get_plugin_config
 from netbox.plugins import PluginTemplateExtension
 
-from netbox_dns.models import Record, Zone, View, NameServer
+from netbox_dns.models import Record
 from netbox_dns.choices import RecordTypeChoices
-from netbox_dns.tables import RelatedRecordTable
+from netbox_dns.tables import RelatedRecordTable, RelatedViewTable
+from netbox_dns.utilities import get_views_by_prefix
 
 
 class RelatedDNSRecords(PluginTemplateExtension):
@@ -42,6 +46,36 @@ class RelatedDNSRecords(PluginTemplateExtension):
         )
 
 
+class RelatedDNSViews(PluginTemplateExtension):
+    model = "ipam.prefix"
+
+    def right_page(self):
+        prefix = self.context.get("object")
+
+        if assigned_views := prefix.netbox_dns_views.all():
+            context = {"assigned_views": RelatedViewTable(data=assigned_views)}
+        elif inherited_views := get_views_by_prefix(prefix):
+            context = {"inherited_views": RelatedViewTable(data=inherited_views)}
+        else:
+            context = {}
+
+        return self.render(
+            "netbox_dns/view/related.html",
+            extra_context=context,
+        )
+
+    def buttons(self):
+        return self.render(
+            "netbox_dns/view/button.html",
+            extra_context={
+                "url": reverse(
+                    "plugins:netbox_dns:prefix_views",
+                    kwargs={"pk": self.context.get("object").pk},
+                ),
+            },
+        )
+
+
 class IPRelatedDNSRecords(PluginTemplateExtension):
     model = "ipam.ipaddress"
 
@@ -80,43 +114,10 @@ class IPRelatedDNSRecords(PluginTemplateExtension):
         )
 
 
-class RelatedDNSObjects(PluginTemplateExtension):
-    model = "tenancy.tenant"
-
-    def left_page(self):
-        obj = self.context.get("object")
-        request = self.context.get("request")
-
-        related_dns_models = (
-            (
-                View.objects.restrict(request.user, "view").filter(tenant=obj),
-                "tenant_id",
-            ),
-            (
-                NameServer.objects.restrict(request.user, "view").filter(tenant=obj),
-                "tenant_id",
-            ),
-            (
-                Zone.objects.restrict(request.user, "view").filter(tenant=obj),
-                "tenant_id",
-            ),
-            (
-                Record.objects.restrict(request.user, "view").filter(tenant=obj),
-                "tenant_id",
-            ),
-        )
-
-        return self.render(
-            "netbox_dns/related_dns_objects.html",
-            extra_context={
-                "related_dns_models": related_dns_models,
-            },
-        )
-
-
-template_extensions = []
+if not settings.PLUGINS_CONFIG["netbox_dns"].get("dnssync_disabled"):
+    template_extensions = [RelatedDNSRecords, RelatedDNSViews]
+else:
+    template_extensions = []
 
-if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
-    template_extensions.append(RelatedDNSRecords)
-elif get_plugin_config("netbox_dns", "feature_ipam_dns_info"):
+if get_plugin_config("netbox_dns", "feature_ipam_dns_info"):
     template_extensions.append(IPRelatedDNSRecords)

netbox_dns/templates/netbox_dns/record.html

@@ -102,12 +102,12 @@
                     <th scope="row">Address Record</th>
                     <td>{{ object.address_record|linkify }}</td>
                 </tr>
-                    {% if object.address_record.ipam_ip_address %}
-                    <tr>
-                        <th scope="row">IPAM IP Address</th>
-                        <td>{{ object.address_record.ipam_ip_address|linkify }}</td>
-                    </tr>
-                    {% endif %}
+                {% if object.address_record.ipam_ip_address %}
+                <tr>
+                    <th scope="row">IPAM IP Address</th>
+                    <td>{{ object.address_record.ipam_ip_address|linkify }}</td>
+                </tr>
+                {% endif %}
                 {% endif %}
                 {% if object.ipam_ip_address %}
                 <tr>

netbox_dns/templates/netbox_dns/{contact.html → registrationcontact.html}

@@ -4,7 +4,7 @@
     <div class="row">
         <div class="col col-md-6">
             <div class="card">
-                <h5 class="card-header">Contact</h5>
+                <h5 class="card-header">Registration Contact</h5>
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">Name</th>

netbox_dns/templates/netbox_dns/view/button.html

@@ -0,0 +1,9 @@
+{% load perms %}
+
+{% if perms.netbox_dns.change_view %}
+<a href="{{ url }}?return_url={{ object.get_absolute_url }}">
+    <button type="submit" class="btn btn-primary" name="assign-view">
+        <i class="mdi mdi-eye-outline" aria-hidden="true"></i> DNS Views
+    </button>
+</a>
+{% endif %}

netbox_dns/templates/netbox_dns/view/prefix.html

@@ -0,0 +1,41 @@
+{% extends 'generic/_base.html' %}
+
+{% block title %}
+Configure DNS views for {{ object|meta:"verbose_name" }} {{ object }} {% if object.vrf %}[{{ object.vrf }}]{% endif %}
+{% endblock title %}
+
+{% block content %}
+    <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
+
+    <form action="" method="post" enctype="multipart/form-data" class="object-edit mt-5">
+    {% csrf_token %}
+
+    <div id="form_fields" hx-disinherit="hx-select hx-swap">
+    {% if inherited_from %}
+        <div class="card">
+            <table class="table table-hover attr-table">
+                <th>Views inherited from prefix {{ inherited_from }} {% if inherited_from.vrf %}[{{ inherited_from.vrf }}] {% endif %}</th>
+                {% for view in inherited_views %}
+                    <tr><td>{{ view|linkify }}</td><td>{{ view.description }}</td></tr>
+                {% endfor %}
+            </table>
+        </div>
+    {% endif %}
+    {% block form %}
+    {% include 'htmx/form.html' %}
+    {% endblock form %}
+    </div>
+
+    <div class="text-end my-3">
+    {% block buttons %}
+        <a href="{{ return_url }}" class="btn btn-outline-secondary">Cancel</a>
+        <button type="submit" name="_update" class="btn btn-primary">Save</button>
+    {% endblock buttons %}
+    </div>
+    </form>
+    </div>
+{% endblock content %}
+
+{% block modals %}
+{% include 'inc/htmx_modal.html' with size='lg' %}
+{% endblock %}

netbox_dns/templates/netbox_dns/view/related.html

@@ -0,0 +1,17 @@
+{% load perms %}
+
+{% if perms.netbox_dns.view_view %}
+    {% if assigned_views %}
+        {% if assigned_views.rows|length == 1 %}
+            {% include 'inc/panel_table.html' with table=assigned_views heading='Assigned DNS View' %}
+        {% else %}
+            {% include 'inc/panel_table.html' with table=assigned_views heading='Assigned DNS Views' %}
+        {% endif %}
+    {% elif inherited_views %}
+        {% if inherited_views.rows|length == 1 %}
+            {% include 'inc/panel_table.html' with table=inherited_views heading='Inherited DNS View' %}
+        {% else %}
+            {% include 'inc/panel_table.html' with table=inherited_views heading='Inherited DNS Views' %}
+        {% endif %}
+    {% endif %}
+{% endif %}

netbox_dns/templates/netbox_dns/view.html

@@ -35,6 +35,31 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/tags.html' %}
+            {% if not settings.PLUGINS_CONFIG.netbox_dns.dnssync_disabled %}
+            <div class="card">
+                <h5 class="card-header">
+                    IPAM Prefixes
+                </h5>
+                <div class="card-body">
+                    <table class="table table-hover attr-table">
+                        {% for prefix in object.prefixes.all %}
+                        <tr>
+                            <td>
+                                {{ prefix|linkify }}
+                            </td>
+                            {% if prefix.vrf %}
+                            <td>
+                                {{ prefix.vrf|linkify }}
+                            </td>
+                            {% else %}
+                            <td>Global</td>
+                            {% endif %}
+                        </tr>
+                        {% endfor %}
+                    </table>
+                </div>
+            </div>
+            {% endif %}
         </div>
     </div>
 {% endblock %}

netbox_dns/urls/__init__.py

@@ -1,4 +1,4 @@
-from .contact import contact_urlpatterns
+from .registration_contact import registrationcontact_urlpatterns
 from .nameserver import nameserver_urlpatterns
 from .record import record_urlpatterns
 from .record_template import recordtemplate_urlpatterns
@@ -10,7 +10,7 @@ from .zone_template import zonetemplate_urlpatterns
 app_name = "netbox_dns"
 
 urlpatterns = (
-    contact_urlpatterns
+    registrationcontact_urlpatterns
     + nameserver_urlpatterns
     + record_urlpatterns
     + recordtemplate_urlpatterns

netbox_dns/urls/registration_contact.py

@@ -0,0 +1,60 @@
+from django.urls import include, path
+
+from utilities.urls import get_model_urls
+
+from netbox_dns.views import (
+    RegistrationContactView,
+    RegistrationContactListView,
+    RegistrationContactEditView,
+    RegistrationContactDeleteView,
+    RegistrationContactBulkImportView,
+    RegistrationContactBulkEditView,
+    RegistrationContactBulkDeleteView,
+)
+
+registrationcontact_urlpatterns = [
+    path(
+        "registrationcontacts/<int:pk>/",
+        RegistrationContactView.as_view(),
+        name="registrationcontact",
+    ),
+    path(
+        "registrationcontacts/",
+        RegistrationContactListView.as_view(),
+        name="registrationcontact_list",
+    ),
+    path(
+        "registrationcontacts/add/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_add",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/edit/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_edit",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/delete/",
+        RegistrationContactDeleteView.as_view(),
+        name="registrationcontact_delete",
+    ),
+    path(
+        "registrationcontacts/import/",
+        RegistrationContactBulkImportView.as_view(),
+        name="registrationcontact_import",
+    ),
+    path(
+        "registrationcontacts/edit/",
+        RegistrationContactBulkEditView.as_view(),
+        name="registrationcontact_bulk_edit",
+    ),
+    path(
+        "registrationcontacts/delete/",
+        RegistrationContactBulkDeleteView.as_view(),
+        name="registrationcontact_bulk_delete",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/",
+        include(get_model_urls("netbox_dns", "registrationcontact")),
+    ),
+]

netbox_dns/urls/view.py

@@ -10,6 +10,7 @@ from netbox_dns.views import (
     ViewBulkImportView,
     ViewBulkEditView,
     ViewBulkDeleteView,
+    ViewPrefixEditView,
 )
 
 view_urlpatterns = [
@@ -22,4 +23,9 @@ view_urlpatterns = [
     path("views/edit/", ViewBulkEditView.as_view(), name="view_bulk_edit"),
     path("views/delete/", ViewBulkDeleteView.as_view(), name="view_bulk_delete"),
     path("views/<int:pk>/", include(get_model_urls("netbox_dns", "view"))),
+    path(
+        "prefixes/<int:pk>/assign-views/",
+        ViewPrefixEditView.as_view(),
+        name="prefix_views",
+    ),
 ]

netbox_dns/utilities/__init__.py

@@ -1,74 +1,2 @@
-import re
-
-from dns import name as dns_name
-from dns.exception import DNSException
-from netaddr import IPNetwork, AddrFormatError
-
-from netbox.plugins.utils import get_plugin_config
-
-
-class NameFormatError(Exception):
-    pass
-
-
-def arpa_to_prefix(arpa_name):
-    name = arpa_name.rstrip(".")
-
-    if name.endswith(".in-addr.arpa"):
-        address = ".".join(reversed(name.replace(".in-addr.arpa", "").split(".")))
-        mask = len(address.split(".")) * 8
-        address = address + (32 - mask) // 8 * ".0"
-
-        try:
-            return IPNetwork(f"{address}/{mask}")
-        except (AddrFormatError, ValueError):
-            return None
-
-    elif name.endswith("ip6.arpa"):
-        address = "".join(reversed(name.replace(".ip6.arpa", "").split(".")))
-        mask = len(address)
-        address = address + "0" * (32 - mask)
-
-        try:
-            return IPNetwork(
-                f"{':'.join([(address[i:i+4]) for i in range(0, 32, 4)])}/{mask*4}"
-            )
-        except AddrFormatError:
-            return None
-
-    else:
-        return None
-
-
-def name_to_unicode(name):
-    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-        return "."
-
-    try:
-        return dns_name.from_text(name, origin=None).to_unicode()
-    except dns_name.IDNAException:
-        return name
-
-
-def value_to_unicode(value):
-    return re.sub(
-        r"xn--[0-9a-z-_.]*",
-        lambda x: name_to_unicode(x.group(0)),
-        value,
-        flags=re.IGNORECASE,
-    )
-
-
-def normalize_name(name):
-    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
-        return "."
-
-    try:
-        return (
-            dns_name.from_text(name, origin=dns_name.root)
-            .relativize(dns_name.root)
-            .to_text()
-        )
-
-    except DNSException as exc:
-        raise NameFormatError from exc
+from .conversions import *
+from .ipam_dnssync import *

netbox_dns/utilities/conversions.py

@@ -0,0 +1,83 @@
+import re
+
+from dns import name as dns_name
+from dns.exception import DNSException
+from netaddr import IPNetwork, AddrFormatError
+
+from netbox.plugins.utils import get_plugin_config
+
+
+__all__ = (
+    "NameFormatError",
+    "arpa_to_prefix",
+    "name_to_unicode",
+    "value_to_unicode",
+    "normalize_name",
+)
+
+
+class NameFormatError(Exception):
+    pass
+
+
+def arpa_to_prefix(arpa_name):
+    name = arpa_name.rstrip(".")
+
+    if name.endswith(".in-addr.arpa"):
+        address = ".".join(reversed(name.replace(".in-addr.arpa", "").split(".")))
+        mask = len(address.split(".")) * 8
+        address = address + (32 - mask) // 8 * ".0"
+
+        try:
+            return IPNetwork(f"{address}/{mask}")
+        except (AddrFormatError, ValueError):
+            return None
+
+    elif name.endswith("ip6.arpa"):
+        address = "".join(reversed(name.replace(".ip6.arpa", "").split(".")))
+        mask = len(address)
+        address = address + "0" * (32 - mask)
+
+        try:
+            return IPNetwork(
+                f"{':'.join([(address[i:i+4]) for i in range(0, 32, 4)])}/{mask*4}"
+            )
+        except AddrFormatError:
+            return None
+
+    else:
+        return None
+
+
+def name_to_unicode(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
+    try:
+        return dns_name.from_text(name, origin=None).to_unicode()
+    except dns_name.IDNAException:
+        return name
+
+
+def value_to_unicode(value):
+    return re.sub(
+        r"xn--[0-9a-z-_.]*",
+        lambda x: name_to_unicode(x.group(0)),
+        value,
+        flags=re.IGNORECASE,
+    )
+
+
+def normalize_name(name):
+    if name == "." and get_plugin_config("netbox_dns", "enable_root_zones"):
+        return "."
+
+    try:
+        return (
+            dns_name.from_text(name, origin=dns_name.root)
+            .relativize(dns_name.root)
+            .to_text()
+        )
+
+    except DNSException as exc:
+        raise NameFormatError from exc