netbox-ddns 1.3.0__tar.gz → 1.4.0__tar.gz

{netbox_ddns-1.3.0/netbox_ddns.egg-info → netbox_ddns-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-ddns
-Version: 1.3.0
+Version: 1.4.0
 Summary: Dynamic DNS Connector for NetBox
 Home-page: https://github.com/sjm-steffann/netbox-ddns
 Author: Sander Steffann

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/__init__.py

@@ -1,4 +1,4 @@
-VERSION = '1.3.0'
+VERSION = '1.4.0'
 
 try:
     from netbox.plugins import PluginConfig
@@ -13,7 +13,7 @@ class NetBoxDDNSConfig(PluginConfig):
     verbose_name = 'Dynamic DNS'
     version = VERSION
     min_version = '4.0.0'
-    max_version = '4.0.999'
+    max_version = '4.1.999'
     author = 'Sander Steffann'
     author_email = 'sander@steffann.nl'
     description = 'Dynamic DNS Connector for NetBox'

netbox_ddns-1.4.0/netbox_ddns/api/serializers.py

@@ -0,0 +1,17 @@
+from rest_framework import serializers
+from rest_framework.relations import PrimaryKeyRelatedField
+from ipam.models import IPAddress
+from netbox.api.serializers import NetBoxModelSerializer
+from ..models import ExtraDNSName
+
+
+class ExtraDNSNameSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='plugins-api:netbox_ddns-api:extradnsname-detail'
+    )
+    ip_address = PrimaryKeyRelatedField(queryset=IPAddress.objects.all(),)
+
+    class Meta:
+        model = ExtraDNSName
+        fields = ('id', 'ip_address', 'name', 'url')
+        read_only_fields = ('id', 'url')

netbox_ddns-1.4.0/netbox_ddns/api/urls.py

@@ -0,0 +1,10 @@
+from netbox.api.routers import NetBoxRouter
+from . import views
+
+
+app_name = 'netbox_ddns'
+
+router = NetBoxRouter()
+router.register('extra-dns-name', views.ExtraDNSNameViewSet)
+
+urlpatterns = router.urls

netbox_ddns-1.4.0/netbox_ddns/api/views.py

@@ -0,0 +1,10 @@
+from netbox.api.viewsets import NetBoxModelViewSet
+from ..filtersets import ExtraDNSNameFilterSet
+from ..models import ExtraDNSName
+from .serializers import ExtraDNSNameSerializer
+
+
+class ExtraDNSNameViewSet(NetBoxModelViewSet):
+    queryset = ExtraDNSName.objects.all()
+    serializer_class = ExtraDNSNameSerializer
+    filterset_class = ExtraDNSNameFilterSet

netbox_ddns-1.4.0/netbox_ddns/filtersets.py

@@ -0,0 +1,8 @@
+from netbox.filtersets import NetBoxModelFilterSet
+from .models import ExtraDNSName
+
+
+class ExtraDNSNameFilterSet(NetBoxModelFilterSet):
+    class Meta:
+        model = ExtraDNSName
+        fields = ('id', 'name', 'ip_address', 'forward_rcode')

netbox_ddns-1.4.0/netbox_ddns/migrations/0009_alter_dnsstatus_id_alter_extradnsname_id_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.0.9 on 2024-11-11 17:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_ddns', '0008_server_server_port'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dnsstatus',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='extradnsname',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='reversezone',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='server',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='zone',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False),
+        ),
+    ]

netbox_ddns-1.4.0/netbox_ddns/migrations/0010_extradnsname_created_extradnsname_custom_field_data_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.0.9 on 2024-11-11 17:14
+
+import taggit.managers
+import utilities.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0121_customfield_related_object_filter'),
+        ('netbox_ddns', '0009_alter_dnsstatus_id_alter_extradnsname_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='extradnsname',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='extradnsname',
+            name='custom_field_data',
+            field=models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder),
+        ),
+        migrations.AddField(
+            model_name='extradnsname',
+            name='last_updated',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='extradnsname',
+            name='tags',
+            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
+        ),
+    ]

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/models.py

@@ -12,7 +12,7 @@ from dns import rcode
 from dns.tsig import HMAC_MD5, HMAC_SHA1, HMAC_SHA224, HMAC_SHA256, HMAC_SHA384, HMAC_SHA512
 from netaddr import IPNetwork, ip
 from typing import Optional
-
+from netbox.models import NetBoxModel
 from ipam.fields import IPNetworkField
 from ipam.models import IPAddress
 from .utils import normalize_fqdn
@@ -325,7 +325,7 @@ class DNSStatus(models.Model):
         return format_html('<span style="color:{colour}">{output}</span', colour=colour, output=output)
 
 
-class ExtraDNSName(models.Model):
+class ExtraDNSName(NetBoxModel):
     ip_address = models.ForeignKey(
         to=IPAddress,
         verbose_name=_('IP address'),
@@ -367,7 +367,7 @@ class ExtraDNSName(models.Model):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('plugins:netbox_ddns:extradnsname_edit', args=[self.ip_address.pk, self.pk])
+        return reverse('plugins:netbox_ddns:extradnsname', args=[self.ip_address.pk, self.pk])
 
     def clean(self):
         # Ensure trailing dots from domain-style fields

netbox_ddns-1.4.0/netbox_ddns/search.py

@@ -0,0 +1,10 @@
+from netbox.search import SearchIndex, register_search
+from .models import ExtraDNSName
+
+
+@register_search
+class AccessListIndex(SearchIndex):
+    model = ExtraDNSName
+    fields = (
+        ('name', 100),
+    )

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/tables.py

@@ -21,13 +21,13 @@ FORWARD_DNS = """
 ACTIONS = """
     {% if perms.netbox_ddns.change_extradnsname %}
         <a href="{% url 'plugins:netbox_ddns:extradnsname_edit' ipaddress_pk=record.ip_address.pk pk=record.pk %}" 
-           class="btn btn-sm btn-warning">
+           class="btn btn-warning">
             <i class="mdi mdi-pencil" aria-hidden="true"></i>
         </a>
     {% endif %}
     {% if perms.netbox_ddns.delete_extradnsname %}
         <a href="{% url 'plugins:netbox_ddns:extradnsname_delete' ipaddress_pk=record.ip_address.pk pk=record.pk %}"
-           class="btn btn-sm btn-danger">
+           class="btn btn-danger">
             <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
         </a>
     {% endif %}

netbox_ddns-1.4.0/netbox_ddns/templates/netbox_ddns/extradnsname.html

@@ -0,0 +1,169 @@
+{% extends 'generic/_base.html' %}
+{% load buttons %}
+{% load custom_links %}
+{% load helpers %}
+{% load perms %}
+{% load plugins %}
+{% load tabs %}
+{% load i18n %}
+
+{% comment %}
+    Blocks:
+    - page-header:          Content displayed above the primary page content
+    - breadcrumbs:        Breadcrumb list items(HTML
+    <li> elements)
+    - object_identifier:  Unique identifier for the object
+    - title:                Page title
+    - subtitle:             Additional context displayed below the title
+    - controls:             Control elements displayed between the header and content
+    - control-buttons:    Action buttons (add/edit/delete/etc.)
+    - extra_controls:   Any additional action buttons to display
+    - tabs:                 Page tabs
+    - content:              Primary page content
+    - modals:               Any pre-loaded modals
+
+    Context:
+    - object: The object being viewed
+{% endcomment %}
+
+{% block page-header %}
+    <div class="container-fluid">
+        <div class="d-flex justify-content-between align-items-center mt-2">
+
+            {# Object identifier #}
+            <code class="d-block text-muted bg-transparent px-0">
+                {% block object_identifier %}
+                    {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}
+                    {% if object.slug %}({{ object.slug }}){% endif %}
+                {% endblock object_identifier %}
+            </code>
+
+        </div>
+    </div>
+    {{ block.super }}
+{% endblock page-header %}
+
+{% block title %}{{ object }}{% endblock %}
+
+{% block subtitle %}
+    <div class="text-secondary fs-5">
+        {% trans "Created" %} {{ object.created|isodatetime:"minutes" }}
+        {% if object.last_updated %}
+            <span class="separator">&middot;</span>
+            {% trans "Updated" %} {{ object.last_updated|isodatetime:"minutes" }}
+        {% endif %}
+    </div>
+{% endblock subtitle %}
+
+{% block controls %}
+    <div class="btn-list justify-content-end mb-2">
+        {% plugin_buttons object %}
+
+        {# Add/edit/delete/etc. buttons #}
+        {% block control-buttons %}
+
+            {# Extra buttons #}
+            {% block extra_controls %}{% endblock %}
+
+            {# Default buttons #}
+            {% if perms.extras.add_bookmark and object.bookmarks %}
+                {% bookmark_button object %}
+            {% endif %}
+            {% if perms.extras.add_subscription and object.subscriptions %}
+                {% subscribe_button object %}
+            {% endif %}
+            {% if request.user|can_change:object %}
+                {% load i18n %}
+                <a href="{% url 'plugins:netbox_ddns:extradnsname_edit' ipaddress_pk=object.ip_address.pk pk=object.pk %}"
+                   class="btn btn-yellow" role="button">
+                    <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit" %}
+                </a>
+            {% endif %}
+            {% if request.user|can_delete:object %}
+                {% load i18n %}
+                <a href="#"
+                   hx-get="{% url 'plugins:netbox_ddns:extradnsname_delete' ipaddress_pk=object.ip_address.pk pk=object.pk %}"
+                   hx-target="#htmx-modal-content"
+                   hx-swap="innerHTML"
+                   hx-select="form"
+                   class="btn btn-red"
+                   data-bs-toggle="modal"
+                   data-bs-target="#htmx-modal"
+                >
+                    <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
+                </a>
+
+            {% endif %}
+        {% endblock control-buttons %}
+    </div>
+
+    {# Custom links #}
+    <div class="d-flex justify-content-end">
+        <div class="btn-list">
+            {% block custom-links %}
+                {% custom_links object %}
+            {% endblock custom-links %}
+        </div>
+    </div>
+{% endblock controls %}
+
+{% block tabs %}
+    <ul class="nav nav-tabs" role="presentation">
+        {# Primary tab #}
+        <li class="nav-item">
+            <a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">
+                {{ object|meta:"verbose_name"|bettertitle }}</a>
+        </li>
+
+        {# Include tabs for registered model views #}
+        {% model_view_tabs object %}
+    </ul>
+{% endblock tabs %}
+
+{% block alerts %}
+    {% plugin_alerts object %}
+{% endblock alerts %}
+
+{% block content %}
+    <div class="row mb-3">
+        <div class="col col-md-6">
+            <div class="card">
+                <h5 class="card-header">Access List</h5>
+                <div class="card-body">
+                    <table class="table table-hover attr-table">
+                        <tr>
+                            <th scope="row">Name</th>
+                            <td>{{ object.name }}</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">IP Address</th>
+                            <td>
+                                <a href="{{ object.ip_address.get_absolute_url }}">{{ object.ip_address }}</a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Last update</th>
+                            <td>{{ object.last_update|isodatetime }}</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Forward DNS</th>
+                            <td>
+                                {% if object.forward_action is not None %}
+                                    {{ object.get_forward_action_display }}:
+                                    {{ object.get_forward_rcode_html_display }} {% else %}
+                                    <span class="text-muted">Not created</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            {% include 'inc/panels/custom_fields.html' %}
+        </div>
+        <div class="col col-md-6">{% include 'inc/panels/tags.html' %}</div>
+    </div>
+{% endblock content %}
+
+{% block modals %}
+    {% include 'inc/htmx_modal.html' %}
+{% endblock modals %}

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/templates/netbox_ddns/ipaddress/dns_extra.html

@@ -11,7 +11,7 @@
         {% if perms.netbox_ddns.add_extradnsname %}
             <div class="card-footer text-right noprint">
                 <a href="{% url 'plugins:netbox_ddns:extradnsname_create' ipaddress_pk=object.pk %}"
-                   class="btn btn-sm btn-primary">
+                   class="btn btn-primary">
                     <span class="mdi mdi-plus" aria-hidden="true"></span>Add extra DNS name
                 </a>
             </div>

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/templates/netbox_ddns/ipaddress/dns_refresh_button.html

@@ -4,7 +4,7 @@
 
         <button type="submit" name="_edit"
                 formaction="{% url 'plugins:netbox_ddns:ipaddress_dnsname_recreate' ipaddress_pk=object.pk %}"
-                class="btn btn-sm btn-secondary">
+                class="btn btn-secondary">
             <span class="mdi mdi-refresh" aria-hidden="true"></span> Recreate DNS
         </button>
     </form>

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from .views import ExtraDNSNameCreateView, ExtraDNSNameDeleteView, ExtraDNSNameEditView, IPAddressDNSNameRecreateView
+from .views import ExtraDNSNameCreateView, ExtraDNSNameDeleteView, ExtraDNSNameEditView, IPAddressDNSNameRecreateView, ExtraDNSNameView
 
 urlpatterns = [
     path(route='ip-addresses/<int:ipaddress_pk>/recreate/',
@@ -15,4 +15,8 @@ urlpatterns = [
     path(route='ip-addresses/<int:ipaddress_pk>/extra/<int:pk>/delete/',
          view=ExtraDNSNameDeleteView.as_view(),
          name='extradnsname_delete'),
+
+    path(route='ip-addresses/<int:ipaddress_pk>/extra/<int:pk>/',
+         view=ExtraDNSNameView.as_view(),
+         name='extradnsname'),
 ]

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns/views.py

@@ -1,7 +1,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views import View
@@ -12,12 +12,16 @@ from netbox_ddns.forms import ExtraDNSNameEditForm
 from netbox_ddns.models import DNSStatus, ExtraDNSName
 from netbox_ddns.utils import normalize_fqdn
 
+from utilities.forms import ConfirmationForm
+from utilities.htmx import htmx_partial
+from utilities.views import get_viewname
+
 try:
     # NetBox <= 2.9
     from utilities.views import ObjectDeleteView, ObjectEditView
 except ImportError:
     # NetBox >= 2.10
-    from netbox.views.generic import ObjectDeleteView, ObjectEditView
+    from netbox.views.generic import ObjectDeleteView, ObjectEditView, ObjectView
 
 
 # noinspection PyMethodMayBeStatic
@@ -63,6 +67,11 @@ class ExtraDNSNameCreateView(PermissionRequiredMixin, ExtraDNSNameObjectMixin, O
     def model_form(self):
         return self.form
 
+
+class ExtraDNSNameView(PermissionRequiredMixin,ExtraDNSNameObjectMixin,ObjectView):
+    permission_required = 'netbox_ddns.view_extradnsname'
+    queryset = ExtraDNSName.objects.all()
+
 class ExtraDNSNameEditView(ExtraDNSNameCreateView):
     permission_required = 'netbox_ddns.change_extradnsname'
 
@@ -71,6 +80,38 @@ class ExtraDNSNameDeleteView(PermissionRequiredMixin, ExtraDNSNameObjectMixin, O
     permission_required = 'netbox_ddns.delete_extradnsname'
     queryset = ExtraDNSName.objects.all()
 
+    # Override request handler to fix the error on delete GET due to missing reverse route argument
+    def get(self, request, *args, **kwargs):
+        """
+        GET request handler.
+
+        Args:
+            request: The current request
+        """
+        obj = self.get_object(**kwargs)
+        form = ConfirmationForm(initial=request.GET)
+
+        try:
+            dependent_objects = self._get_dependent_objects(obj)
+        except ProtectedError as e:
+            return self._handle_protected_objects(obj, e.protected_objects, request, e)
+        except RestrictedError as e:
+            return self._handle_protected_objects(obj, e.restricted_objects, request, e)
+
+        # If this is an HTMX request, return only the rendered deletion form as modal content
+        if htmx_partial(request):
+            viewname = get_viewname(self.queryset.model, action='delete')
+            form_url = reverse(viewname, kwargs={'pk': obj.pk, 'ipaddress_pk': obj.ip_address.pk})
+            return render(request, 'htmx/delete_form.html', {
+                'object': obj,
+                'object_type': self.queryset.model._meta.verbose_name,
+                'form': form,
+                'form_url': form_url,
+                'dependent_objects': dependent_objects,
+                **self.get_extra_context(request, obj),
+            })
+
+
 
 class IPAddressDNSNameRecreateView(PermissionRequiredMixin, View):
     permission_required = 'ipam.change_ipaddress'

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0/netbox_ddns.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-ddns
-Version: 1.3.0
+Version: 1.4.0
 Summary: Dynamic DNS Connector for NetBox
 Home-page: https://github.com/sjm-steffann/netbox-ddns
 Author: Sander Steffann

{netbox_ddns-1.3.0 → netbox_ddns-1.4.0}/netbox_ddns.egg-info/SOURCES.txt

@@ -7,8 +7,10 @@ setup.py
 netbox_ddns/__init__.py
 netbox_ddns/admin.py
 netbox_ddns/background_tasks.py
+netbox_ddns/filtersets.py
 netbox_ddns/forms.py
 netbox_ddns/models.py
+netbox_ddns/search.py
 netbox_ddns/signals.py
 netbox_ddns/tables.py
 netbox_ddns/template_content.py
@@ -22,6 +24,10 @@ netbox_ddns.egg-info/dependency_links.txt
 netbox_ddns.egg-info/not-zip-safe
 netbox_ddns.egg-info/requires.txt
 netbox_ddns.egg-info/top_level.txt
+netbox_ddns/api/__init__.py
+netbox_ddns/api/serializers.py
+netbox_ddns/api/urls.py
+netbox_ddns/api/views.py
 netbox_ddns/migrations/0001_initial.py
 netbox_ddns/migrations/0002_add_ttl.py
 netbox_ddns/migrations/0003_dnsstatus.py
@@ -30,7 +36,10 @@ netbox_ddns/migrations/0005_extradnsname.py
 netbox_ddns/migrations/0006_extradns_cname.py
 netbox_ddns/migrations/0007_zone_meta.py
 netbox_ddns/migrations/0008_server_server_port.py
+netbox_ddns/migrations/0009_alter_dnsstatus_id_alter_extradnsname_id_and_more.py
+netbox_ddns/migrations/0010_extradnsname_created_extradnsname_custom_field_data_and_more.py
 netbox_ddns/migrations/__init__.py
+netbox_ddns/templates/netbox_ddns/extradnsname.html
 netbox_ddns/templates/netbox_ddns/ipaddress/dns_extra.html
 netbox_ddns/templates/netbox_ddns/ipaddress/dns_info.html
 netbox_ddns/templates/netbox_ddns/ipaddress/dns_refresh_button.html