netbox-plugin-dns 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

netbox_dns/templates/netbox_dns/zone/child.html

@@ -2,6 +2,7 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
     {% include 'inc/table_controls_htmx.html' with table_modal="ZoneTable_config" %}
@@ -23,12 +24,12 @@
                          {% block bulk_buttons %}{% endblock %}
                          {% if bulk_edit_url and perms.netbox_dns.change_zone %}
                              <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning">
-                                 <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
+                                 <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
                              </button>
                          {% endif %}
                          {% if bulk_delete_url and perms.netbox_dns.delete_zone %}
                              <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger">
-                                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
+                                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
                              </button>
                          {% endif %}
                      </div>

netbox_dns/templates/netbox_dns/zone/record.html

@@ -2,6 +2,7 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
     {% include 'inc/table_controls_htmx.html' with table_modal="RecordTable_config" %}
@@ -23,12 +24,12 @@
                            {% block bulk_buttons %}{% endblock %}
                            {% if bulk_edit_url and perms.netbox_dns.change_record %}
                                <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning">
-                                   <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
+                                   <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
                                </button>
                            {% endif %}
                            {% if bulk_delete_url and perms.netbox_dns.delete_record %}
                                <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger">
-                                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete Selected
+                                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
                                </button>
                            {% endif %}
                        </div>

netbox_dns/templates/netbox_dns/zone/registration.html

@@ -1,32 +1,33 @@
 {% extends 'netbox_dns/zone/base.html' %}
 {% load helpers %}
+{% load i18n %}
 
 {% block content %}
 <div class="card">
-    <h5 class="card-header">Domain Registration</h5>
+    <h5 class="card-header">{% trans "Domain Registration" %}</h5>
     <table class="table table-hover attr-table">
         <tr>
-            <th scope="row">Registrar</th>
+            <th scope="row">{% trans "Registrar" %}</th>
             <td>{{ object.registrar|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Registry Domain ID</th>
+            <th scope="row">{% trans "Registry Domain ID" %}</th>
             <td>{{ object.registry_domain_id|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Registrant</th>
+            <th scope="row">{% trans "Registrant" %}</th>
             <td>{{ object.registrant|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Administrative Contact</th>
+            <th scope="row">{% trans "Administrative Contact" %}</th>
             <td>{{ object.admin_c|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Technical Contact</th>
+            <th scope="row">{% trans "Technical Contact" %}</th>
             <td>{{ object.tech_c|linkify|placeholder }}</td>
         </tr>
         <tr>
-            <th scope="row">Billing Contact</th>
+            <th scope="row">{% trans "Billing Contact" %}</th>
             <td>{{ object.billing_c|linkify|placeholder }}</td>
         </tr>
     </table>

netbox_dns/templates/netbox_dns/zone.html

@@ -1,43 +1,41 @@
 {% extends 'netbox_dns/zone/base.html' %}
 {% load helpers %}
-{% load render_table from django_tables2 %}
+{% load i18n %}
 
 {% block content %}
 <div class="row">
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">
-                Zone
-            </h5>
+            <h5 class="card-header">{% trans "Zone" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Name</th>
+                    <th scope="row">{% trans "Name" %}</th>
                     <td>{{ object.name }}</td>
                 </tr>
                 {% if unicode_name %}
                     <tr>
-                        <th scope="row">IDN</th>
+                        <th scope="row">{% trans "IDN" %}</th>
                         <td>{{ unicode_name }}</td>
                     </tr>
                 {% endif %}
                 {% if parent_zone %}
                     <tr>
-                        <th scope="row">Parent Zone</th>
+                        <th scope="row">{% trans "Parent Zone" %}</th>
                         <td>{{ parent_zone|linkify }}</td>
                     </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">View</th>
+                    <th scope="row">{% trans "View" context "DNS" %}</th>
                     <td>{{ object.view|linkify }}</td>
                 </tr>
                 {% if object.description %}
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Tenant</th>
+                    <th scope="row">{% trans "Tenant" %}</th>
                     <td>
                         {% if object.tenant.group %}
                             {{ object.tenant.group|linkify }} /
@@ -46,11 +44,11 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Status</th>
+                    <th scope="row">{% trans "Status" %}</th>
                     <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Nameservers</th>
+                    <th scope="row">{% trans "Nameservers" %}</th>
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
@@ -60,7 +58,7 @@
                     </td>
                 {% if nameserver_warnings %}
                 <tr>
-                    <th class="text-warning" scope="row">Warnings</th>
+                    <th class="text-warning" scope="row">{% trans "Warnings" %}</th>
                     <td>
                         <table>
                             {% for warning in nameserver_warnings %}
@@ -74,7 +72,7 @@
                 {% endif %}
                 {% if nameserver_errors %}
                 <tr>
-                    <th class="text-danger" scope="row">Errors</th>
+                    <th class="text-danger" scope="row">{% trans "Errors" %}</th>
                     <td>
                         <table>
                             {% for error in nameserver_errors %}
@@ -88,11 +86,11 @@
                 {% endif %}
                 </tr>
                 <tr>
-                    <th scope="row">Default TTL</th>
+                    <th scope="row">{% trans "Default TTL" %}</th>
                     <td>{{ object.default_ttl }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td>{{ object.description }}</td>
                 </tr>
             </table>
@@ -103,64 +101,64 @@
     </div>
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">Zone SOA</h5>
+            <h5 class="card-header">{% trans "Zone SOA" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">TTL</th>
+                    <th scope="row">{% trans "TTL" %}</th>
                     <td>{{ object.soa_ttl }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">MName</th>
+                    <th scope="row">{% trans "MName" %}</th>
                     <td>{{ object.soa_mname|linkify }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">RName</th>
+                    <th scope="row">{% trans "RName" %}</th>
                     <td>{{ object.soa_rname }}</td>
                 </tr>
                 {% if object.soa_serial_auto %}
                 <tr>
-                    <th scope="row">Serial (auto-generated)</th>
+                    <th scope="row">{% trans "Serial (auto-generated)" %}</th>
                     <td>{{ object.soa_serial }}</td>
                 </tr>
                 {% else %}
                 <tr>
-                    <th scope="row">Serial</th>
+                    <th scope="row">{% trans "Serial" context "SOA" %}</th>
                     <td>{{ object.soa_serial }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Refresh</th>
+                    <th scope="row">{% trans "Refresh" %}</th>
                     <td>{{ object.soa_refresh }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Retry</th>
+                    <th scope="row">{% trans "Retry" %}</th>
                     <td>{{ object.soa_retry }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Expire</th>
+                    <th scope="row">{% trans "Expire" %}</th>
                     <td>{{ object.soa_expire }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Minimum TTL</th>
+                    <th scope="row">{% trans "Minimum TTL" %}</th>
                     <td>{{ object.soa_minimum }}</td>
                 </tr>
             </table>
         </div>
         {% if object.rfc2317_prefix %}
         <div class="card">
-            <h5 class="card-header">RFC2317</h5>
+            <h5 class="card-header">{% trans "RFC2317" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Prefix</th>
+                    <th scope="row">{% trans "Prefix" %}</th>
                     <td>{{ object.rfc2317_prefix }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Parent Managed</th>
+                    <th scope="row">{% trans "Parent Managed" %}</th>
                     <td>{% checkmark object.rfc2317_parent_managed %}</td>
                 </tr>
                 {% if object.rfc2317_parent_managed %}
                 <tr>
-                    <th scope="row">Parent Zone</th>
+                    <th scope="row">{% trans "Parent Zone" %}</th>
                     <td>{{ object.rfc2317_parent_zone|linkify }}</td>
                 </tr>
                 {% endif %}

netbox_dns/templates/netbox_dns/zonetemplate.html

@@ -3,27 +3,26 @@
 {% load plugins %}
 {% load render_table from django_tables2 %}
 {% load perms %}
+{% load i18n %}
 
 {% block content %}
 <div class="row">
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">
-                Zone Template
-            </h5>
+            <h5 class="card-header">{% trans "Zone Template" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Name</th>
+                    <th scope="row">{% trans "Name" %}</th>
                     <td>{{ object.name }}</td>
                 </tr>
                 {% if object.description %}
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
                 <tr>
-                    <th scope="row">Tenant</th>
+                    <th scope="row">{% trans "Tenant" %}</th>
                     <td>
                         {% if object.tenant.group %}
                             {{ object.tenant.group|linkify }} /
@@ -32,7 +31,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Nameservers</th>
+                    <th scope="row">{% trans "Nameservers" %}</th>
                     <td>
                         <table>
                             {% for nameserver in object.nameservers.all %}
@@ -42,7 +41,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <th scope="row">Description</th>
+                    <th scope="row">{% trans "Description" %}</th>
                     <td>{{ object.description }}</td>
                 </tr>
             </table>
@@ -53,34 +52,45 @@
     </div>
     <div class="col col-md-6">
         <div class="card">
-            <h5 class="card-header">Domain Registration</h5>
+            <h5 class="card-header">{% trans "Domain Registration" %}</h5>
             <table class="table table-hover attr-table">
                 <tr>
-                    <th scope="row">Registrar</th>
+                    <th scope="row">{% trans "Registrar" %}</th>
                     <td>{{ object.registrar|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Registrant</th>
+                    <th scope="row">{% trans "Registrant" %}</th>
                     <td>{{ object.registrant|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Administrative Contact</th>
+                    <th scope="row">{% trans "Administrative Contact" %}</th>
                     <td>{{ object.admin_c|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Technical Contact</th>
+                    <th scope="row">{% trans "Technical Contact" %}</th>
                     <td>{{ object.tech_c|linkify|placeholder }}</td>
                 </tr>
                 <tr>
-                    <th scope="row">Billing Contact</th>
+                    <th scope="row">{% trans "Billing Contact" %}</th>
                     <td>{{ object.billing_c|linkify|placeholder }}</td>
                 </tr>
             </table>
             </div>
         </div>
     </div>
-    <div class="col col-md-12">
-      {% include 'inc/panel_table.html' with table=record_template_table heading="Record Templates" %}
-    </div>
+    {% if record_template_table %}
+        <div class="col col-md-12">
+            <div class="card">
+                {% if record_template_table.rows|length == 1 %}
+                    <h2 class="card-header">{% trans "Record Template" %}</h2>
+                {% else %}
+                    <h2 class="card-header">{% trans "Record Templates" %}</h2>
+                {% endif %}
+                <div class="table-responsive">
+                    {% render_table record_template_table 'inc/table.html' %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
 </div>
 {% endblock %}

netbox_dns/utilities/ipam_dnssync.py

@@ -10,9 +10,6 @@ from django.db.models import Q
 from netbox.context import current_request
 from ipam.models import IPAddress, Prefix
 
-from netbox_dns.models import zone as _zone
-from netbox_dns.models import record as _record
-from netbox_dns.models import view as _view
 from netbox_dns.choices import RecordStatusChoices
 
 
@@ -26,6 +23,7 @@ __all__ = (
     "get_ip_addresses_by_view",
     "get_ip_addresses_by_zone",
     "check_record_permission",
+    "get_query_from_filter",
 )
 
 
@@ -74,6 +72,8 @@ def _match_data(ip_address, record):
 
 
 def get_zones(ip_address, view=None, old_zone=None):
+    from netbox_dns.models import Zone
+
     if view is None:
         views = _get_assigned_views(ip_address)
         if not views:
@@ -91,7 +91,7 @@ def get_zones(ip_address, view=None, old_zone=None):
         for i in range(min_labels + 1, len(fqdn.labels) + 1)
     ]
 
-    zones = _zone.Zone.objects.filter(
+    zones = Zone.objects.filter(
         view__in=views,
         name__in=zone_name_candidates,
         active=True,
@@ -114,28 +114,28 @@ def get_zones(ip_address, view=None, old_zone=None):
 
 
 def check_dns_records(ip_address, zone=None, view=None):
+    from netbox_dns.models import Zone, Record
+
     if ip_address.dns_name == "":
         return
 
     if zone is None:
         zones = get_zones(ip_address, view=view)
 
-        if ip_address.pk is not None:
+        if not ip_address._state.adding:
             for record in ip_address.netbox_dns_records.filter(zone__in=zones):
                 if not _match_data(ip_address, record):
-                    record.update_from_ip_address(ip_address)
+                    updated = record.update_from_ip_address(ip_address)
 
-                    if record is not None:
+                    if updated:
                         record.clean()
 
-            zones = _zone.Zone.objects.filter(
-                pk__in=[zone.pk for zone in zones]
-            ).exclude(
+            zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
                 pk__in=set(ip_address.netbox_dns_records.values_list("zone", flat=True))
             )
 
         for zone in zones:
-            record = _record.Record.create_from_ip_address(
+            record = Record.create_from_ip_address(
                 ip_address,
                 zone,
             )
@@ -143,7 +143,7 @@ def check_dns_records(ip_address, zone=None, view=None):
             if record is not None:
                 record.clean()
 
-    if ip_address.pk is None:
+    if ip_address._state.adding:
         return
 
     try:
@@ -152,63 +152,91 @@ def check_dns_records(ip_address, zone=None, view=None):
         return
 
     for record in ip_address.netbox_dns_records.filter(zone=zone):
-        record.update_from_ip_address(ip_address, new_zone)
+        updated = record.update_from_ip_address(ip_address, new_zone)
 
-        if record is not None:
+        if updated:
             record.clean(new_zone=new_zone)
 
 
-def update_dns_records(ip_address):
+def update_dns_records(ip_address, view=None, force=False):
+    from netbox_dns.models import Zone, Record
+
+    updated = False
+
     if ip_address.dns_name == "":
-        delete_dns_records(ip_address)
-        return
+        return delete_dns_records(ip_address)
+
+    zones = get_zones(ip_address, view=view)
 
-    zones = get_zones(ip_address)
+    if not ip_address._state.adding:
+        if view is None:
+            address_records = ip_address.netbox_dns_records.all()
+        else:
+            address_records = ip_address.netbox_dns_records.filter(zone__view=view)
 
-    if ip_address.pk is not None:
-        for record in ip_address.netbox_dns_records.all():
+        for record in address_records:
             if record.zone not in zones or ip_address.custom_field_data.get(
                 "ipaddress_dns_disabled"
             ):
                 record.delete()
+                updated = True
                 continue
 
             record.update_fqdn()
-            if not _match_data(ip_address, record):
-                record.update_from_ip_address(ip_address)
+            if not _match_data(ip_address, record) or force:
+                updated, deleted = record.update_from_ip_address(ip_address)
 
-                if record is not None:
+                if deleted:
+                    record.delete()
+                    updated = True
+                elif updated:
                     record.save()
+                    updated = True
 
-        zones = _zone.Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
+        zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
             pk__in=set(
                 ip_address.netbox_dns_records.all().values_list("zone", flat=True)
             )
         )
 
     for zone in zones:
-        record = _record.Record.create_from_ip_address(
+        record = Record.create_from_ip_address(
             ip_address,
             zone,
         )
 
         if record is not None:
             record.save()
+            updated = True
+
+    return updated
 
 
-def delete_dns_records(ip_address):
-    for record in ip_address.netbox_dns_records.all():
+def delete_dns_records(ip_address, view=None):
+    deleted = False
+
+    if view is None:
+        address_records = ip_address.netbox_dns_records.all()
+    else:
+        address_records = ip_address.netbox_dns_records.filter(zone__view=view)
+
+    for record in address_records:
         record.delete()
+        deleted = True
+
+    return deleted
 
 
 def get_views_by_prefix(prefix):
+    from netbox_dns.models import View
+
     if (views := prefix.netbox_dns_views.all()).exists():
         return views
 
     if (parent := prefix.get_parents().filter(netbox_dns_views__isnull=False)).exists():
         return parent.last().netbox_dns_views.all()
 
-    return _view.View.objects.none()
+    return View.objects.none()
 
 
 def get_ip_addresses_by_prefix(prefix, check_view=True):
@@ -293,3 +321,18 @@ def check_record_permission(add=True, change=True, delete=True):
             if check
         )
     )
+
+
+def get_query_from_filter(ip_address_filter):
+    query = Q()
+
+    if not isinstance(ip_address_filter, list):
+        ip_address_filter = [ip_address_filter]
+
+    for condition in ip_address_filter:
+        if condition:
+            query |= Q(**condition)
+        else:
+            return Q()
+
+    return query

netbox_dns/validators/dns_name.py

@@ -1,6 +1,7 @@
 import re
 
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext as _
 
 from netbox.plugins.utils import get_plugin_config
 
@@ -55,7 +56,9 @@ def validate_fqdn(name, always_tolerant=False):
     regex = rf"^(\*|{label})(\.{zone_label})+\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid fully qualified DNS host name")
+        raise ValidationError(
+            _("{name} is not a valid fully qualified DNS host name").format(name=name)
+        )
 
 
 def validate_rname(name, always_tolerant=False):
@@ -63,7 +66,7 @@ def validate_rname(name, always_tolerant=False):
     regex = rf"^(\*|{label})(\\\.{label})*(\.{zone_label}){{2,}}\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid RNAME")
+        raise ValidationError(_("{name} is not a valid RName").format(name=name))
 
 
 def validate_generic_name(
@@ -76,7 +79,9 @@ def validate_generic_name(
     regex = rf"^([*@]|(\*\.)?{label}(\.{zone_label})*\.?)$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid DNS host name")
+        raise ValidationError(
+            _("{name} is not a valid DNS host name").format(name=name)
+        )
 
 
 def validate_domain_name(
@@ -97,4 +102,6 @@ def validate_domain_name(
         regex = rf"^{label}(\.{zone_label})*\.?$"
 
     if not re.match(regex, name, flags=re.IGNORECASE) or _has_invalid_double_dash(name):
-        raise ValidationError(f"{name} is not a valid DNS domain name")
+        raise ValidationError(
+            _("{name} is not a valid DNS domain name").format(name=name)
+        )

netbox_dns/validators/dns_value.py

@@ -2,6 +2,7 @@ import dns
 from dns import rdata, name as dns_name
 
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext as _
 
 from netbox_dns.choices import RecordClassChoices, RecordTypeChoices
 from netbox_dns.validators import (
@@ -20,15 +21,19 @@ def validate_record_value(record_type, value):
             name.to_unicode()
         except dns_name.IDNAException as exc:
             raise ValidationError(
-                f"{name.to_text()} is not a valid IDN: {exc}."
-            ) from None
+                "{name} is not a valid IDN: {error}.".format(
+                    name=name.to_text(), error=exc
+                )
+            )
 
     try:
         rr = rdata.from_text(RecordClassChoices.IN, record_type, value)
     except dns.exception.SyntaxError as exc:
         raise ValidationError(
-            f"Record value {value} is not a valid value for a {record_type} record: {exc}."
-        ) from None
+            _(
+                "Record value {value} is not a valid value for a {type} record: {error}."
+            ).format(value=value, type=record_type, error=exc)
+        )
 
     match record_type:
         case RecordTypeChoices.CNAME: