netbox-plugin-dns 1.2.2__tar.gz → 1.2.3__tar.gz

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.2
+Version: 1.2.3
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -69,7 +69,7 @@ For integration with a large number of DNS server implementations integration to
 * NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
-## Compatibility with earlier NetBox Versions
+## Compatibility with NetBox Versions
 
 NetBox Version | NetBox DNS Version | Comment
 -------------- | ------------------ | -------
@@ -78,6 +78,7 @@ NetBox Version | NetBox DNS Version | Comment
 3.7            | 0.22               |
 4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
 4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+4.2            | 1.2                |
 
 ## Installation & Configuration
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/README.md

@@ -53,7 +53,7 @@ For integration with a large number of DNS server implementations integration to
 * NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
-## Compatibility with earlier NetBox Versions
+## Compatibility with NetBox Versions
 
 NetBox Version | NetBox DNS Version | Comment
 -------------- | ------------------ | -------
@@ -62,6 +62,7 @@ NetBox Version | NetBox DNS Version | Comment
 3.7            | 0.22               |
 4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
 4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+4.2            | 1.2                |
 
 ## Installation & Configuration
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/__init__.py

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 
 def _check_list(setting):

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/forms/zone.py

@@ -35,7 +35,7 @@ from netbox_dns.models import (
     ZoneTemplate,
 )
 from netbox_dns.choices import ZoneStatusChoices
-from netbox_dns.utilities import name_to_unicode
+from netbox_dns.utilities import name_to_unicode, network_to_reverse
 from netbox_dns.fields import RFC2317NetworkFormField
 from netbox_dns.validators import validate_ipv4, validate_prefix, validate_rfc2317
 
@@ -307,6 +307,13 @@ class ZoneForm(ZoneTemplateUpdateMixin, TenancyForm, NetBoxModelForm):
             else self.initial["default_ttl"]
         )
 
+    def clean_name(self):
+        name = self.cleaned_data["name"]
+        if reverse_name := network_to_reverse(name):
+            return reverse_name
+        else:
+            return name
+
     class Meta:
         model = Zone
 

netbox_plugin_dns-1.2.3/netbox_dns/models/__init__.py

@@ -0,0 +1,8 @@
+from .zone import *
+from .nameserver import *
+from .record import *
+from .view import *
+from .registration_contact import *
+from .registrar import *
+from .zone_template import *
+from .record_template import *

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/nameserver.html

@@ -23,6 +23,7 @@
                         <td style="word-break:break-all;">{{ object.description }}</td>
                     </tr>
                     {% endif %}
+                    {% if object.tenant %}
                     <tr>
                         <th scope="row">{% trans "Tenant" %}</th>
                         <td>
@@ -32,6 +33,7 @@
                             {{ object.tenant|linkify|placeholder }}
                         </td>
                     </tr>
+                    {% endif %}
                 </table>
             </div>
             {% include 'inc/panels/custom_fields.html' %}

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/record.html

@@ -63,17 +63,6 @@
                     <td><a href="{% url 'plugins:netbox_dns:zone_records' pk=object.zone.pk %}">{{ object.zone }}</a></td>
                     {% endif %}
                 </tr>
-                {% if not object.managed or object.tenant %}
-                <tr>
-                    <th scope="row">{% trans "Tenant" %}</th>
-                    <td>
-                        {% if object.tenant.group %}
-                            {{ object.tenant.group|linkify }} /
-                        {% endif %}
-                        {{ object.tenant|linkify|placeholder }}
-                    </td>
-                </tr>
-                {% endif %}
                 <tr>
                     <th scope="row">{% trans "Type" %}</th>
                     <td>{{ object.type }}</td>
@@ -82,16 +71,33 @@
                     <th scope="row">{% trans "Value" %}</th>
                     <td style="word-break:break-all;">{{ object.value }}</td>
                 </tr>
+                {% if unicode_value %}
+                <tr>
+                    <th scope="row">{% trans "Unicode Value" %}</th>
+                    <td style="word-break:break-all;">{{ unicode_value }}</td>
+                </tr>
+                {% endif %}
                 {% if cname_warning %}
                 <tr class="text-warning">
                     <th scope="row">{% trans "Warning" %}</th>
                     <td>{{ cname_warning }}</td>
                 </tr>
                 {% endif %}
-                {% if unicode_value %}
+                {% if object.description %}
                 <tr>
-                    <th scope="row">{% trans "Unicode Value" %}</th>
-                    <td style="word-break:break-all;">{{ unicode_value }}</td>
+                    <th scope="row">{% trans "Description" %}</th>
+                    <td style="word-break:break-all;">{{ object.description }}</td>
+                </tr>
+                {% endif %}
+                {% if object.tenant %}
+                <tr>
+                    <th scope="row">{% trans "Tenant" %}</th>
+                    <td>
+                        {% if object.tenant.group %}
+                            {{ object.tenant.group|linkify }} /
+                        {% endif %}
+                        {{ object.tenant|linkify|placeholder }}
+                    </td>
                 </tr>
                 {% endif %}
                 <tr>
@@ -132,12 +138,6 @@
                     <th scope="row">Status</th>
                     <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
                 </tr>
-                {% if object.description %}
-                <tr>
-                    <th scope="row">{% trans "Description" %}</th>
-                    <td style="word-break:break-all;">{{ object.description }}</td>
-                </tr>
-                {% endif %}
             </table>
         </div>
         {% if cname_target_table %}

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/view.html

@@ -21,6 +21,7 @@
                         <td style="word-break:break-all;">{{ object.description }}</td>
                     </tr>
                     {% endif %}
+                    {% if object.tenant %}
                     <tr>
                         <th scope="row">{% trans "Tenant" %}</th>
                         <td>
@@ -30,6 +31,7 @@
                             {{ object.tenant|linkify|placeholder }}
                         </td>
                     </tr>
+                    {% endif %}
                 </table>
             </div>
             {% include 'inc/panels/custom_fields.html' %}

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/zone.html

@@ -36,6 +36,7 @@
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
+                {% if object.tenant %}
                 <tr>
                     <th scope="row">{% trans "Tenant" %}</th>
                     <td>
@@ -45,6 +46,7 @@
                         {{ object.tenant|linkify|placeholder }}
                     </td>
                 </tr>
+                {% endif %}
                 <tr>
                     <th scope="row">{% trans "Status" %}</th>
                     <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
@@ -91,10 +93,6 @@
                     <th scope="row">{% trans "Default TTL" %}</th>
                     <td>{{ object.default_ttl }}</td>
                 </tr>
-                <tr>
-                    <th scope="row">{% trans "Description" %}</th>
-                    <td>{{ object.description }}</td>
-                </tr>
             </table>
         </div>
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/zonetemplate.html

@@ -21,6 +21,7 @@
                     <td style="word-break:break-all;">{{ object.description }}</td>
                 </tr>
                 {% endif %}
+                {% if object.tenant %}
                 <tr>
                     <th scope="row">{% trans "Tenant" %}</th>
                     <td>
@@ -30,6 +31,7 @@
                         {{ object.tenant|linkify|placeholder }}
                     </td>
                 </tr>
+                {% endif %}
                 <tr>
                     <th scope="row">{% trans "Nameservers" %}</th>
                     <td>
@@ -40,10 +42,6 @@
                         </table>
                     </td>
                 </tr>
-                <tr>
-                    <th scope="row">{% trans "Description" %}</th>
-                    <td>{{ object.description }}</td>
-                </tr>
             </table>
         </div>
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/utilities/conversions.py

@@ -13,6 +13,7 @@ __all__ = (
     "name_to_unicode",
     "value_to_unicode",
     "normalize_name",
+    "network_to_reverse",
 )
 
 
@@ -81,3 +82,27 @@ def normalize_name(name):
 
     except DNSException as exc:
         raise NameFormatError from exc
+
+
+def network_to_reverse(network):
+    try:
+        ip_network = IPNetwork(network)
+    except AddrFormatError:
+        return
+
+    if ip_network.first == ip_network.last:
+        return
+
+    labels = None
+    match ip_network.version:
+        case 4:
+            if not ip_network.prefixlen % 8:
+                labels = 3 + ip_network.prefixlen // 8
+        case 6:
+            if not ip_network.prefixlen % 4:
+                labels = 3 + ip_network.prefixlen // 4
+        case _:
+            return
+
+    if labels:
+        return ".".join(ip_network[0].reverse_dns.split(".")[-labels:])

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/validators/dns_name.py

@@ -1,4 +1,5 @@
 import re
+from socket import inet_aton
 
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
@@ -95,6 +96,14 @@ def validate_domain_name(
     ):
         return
 
+    try:
+        inet_aton(name)
+        raise ValidationError(
+            _("{name} is not a valid DNS domain name").format(name=name)
+        )
+    except OSError:
+        pass
+
     label, zone_label = _get_label(always_tolerant=always_tolerant)
     if zone_name:
         regex = rf"^{zone_label}(\.{zone_label})*\.?$"

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/nameserver.py

@@ -83,6 +83,7 @@ class NameServerBulkEditView(generic.BulkEditView):
 @register_model_view(NameServer, "bulk_delete", path="delete", detail=False)
 class NameServerBulkDeleteView(generic.BulkDeleteView):
     queryset = NameServer.objects.all()
+    filterset = NameServerFilterSet
     table = NameServerTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/record.py

@@ -198,6 +198,7 @@ class RecordBulkEditView(generic.BulkEditView):
 @register_model_view(Record, "bulk_delete", path="delete", detail=False)
 class RecordBulkDeleteView(generic.BulkDeleteView):
     queryset = Record.objects.filter(managed=False)
+    filterset = RecordFilterSet
     table = RecordTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/record_template.py

@@ -90,4 +90,5 @@ class RecordTemplateBulkEditView(generic.BulkEditView):
 @register_model_view(RecordTemplate, "bulk_delete", path="delete", detail=False)
 class RecordTemplateBulkDeleteView(generic.BulkDeleteView):
     queryset = RecordTemplate.objects.all()
+    filterset = RecordTemplateFilterSet
     table = RecordTemplateTable

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/registrar.py

@@ -72,6 +72,7 @@ class RegistrarBulkEditView(generic.BulkEditView):
 @register_model_view(Registrar, "bulk_delete", path="delete", detail=False)
 class RegistrarBulkDeleteView(generic.BulkDeleteView):
     queryset = Registrar.objects.all()
+    filterset = RegistrarFilterSet
     table = RegistrarTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/registration_contact.py

@@ -73,6 +73,7 @@ class RegistrationContactBulkEditView(generic.BulkEditView):
 @register_model_view(RegistrationContact, "bulk_delete", path="delete", detail=False)
 class RegistrationContactBulkDeleteView(generic.BulkDeleteView):
     queryset = RegistrationContact.objects.all()
+    filterset = RegistrationContactFilterSet
     table = RegistrationContactTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/view.py

@@ -76,6 +76,7 @@ class ViewBulkEditView(generic.BulkEditView):
 @register_model_view(View, "bulk_delete", path="delete", detail=False)
 class ViewBulkDeleteView(generic.BulkDeleteView):
     queryset = View.objects.all()
+    filterset = ViewFilterSet
     table = ViewTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/zone.py

@@ -101,6 +101,7 @@ class ZoneBulkEditView(generic.BulkEditView):
 @register_model_view(Zone, "bulk_delete", path="delete", detail=False)
 class ZoneBulkDeleteView(generic.BulkDeleteView):
     queryset = Zone.objects.all()
+    filterset = ZoneFilterSet
     table = ZoneTable
 
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/views/zone_template.py

@@ -80,4 +80,5 @@ class ZoneTemplateBulkEditView(generic.BulkEditView):
 @register_model_view(ZoneTemplate, "bulk_delete", path="delete", detail=False)
 class ZoneTemplateBulkDeleteView(generic.BulkDeleteView):
     queryset = ZoneTemplate.objects.all()
+    filterset = ZoneTemplateFilterSet
     table = ZoneTemplateTable

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_plugin_dns.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.2
+Version: 1.2.3
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Author-email: Peter Eckel <pete@netbox-dns.org>
 Project-URL: Homepage, https://github.com/peteeckel/netbox-plugin-dns
@@ -69,7 +69,7 @@ For integration with a large number of DNS server implementations integration to
 * NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
-## Compatibility with earlier NetBox Versions
+## Compatibility with NetBox Versions
 
 NetBox Version | NetBox DNS Version | Comment
 -------------- | ------------------ | -------
@@ -78,6 +78,7 @@ NetBox Version | NetBox DNS Version | Comment
 3.7            | 0.22               |
 4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
 4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+4.2            | 1.2                |
 
 ## Installation & Configuration
 

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2.2"
+version = "1.2.3"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = [
     {name="Peter Eckel", email="pete@netbox-dns.org"},

netbox_plugin_dns-1.2.2/netbox_dns/models/__init__.py

@@ -1,13 +0,0 @@
-from .zone import *
-from .nameserver import *
-from .record import *
-from .view import *
-from .registration_contact import *
-from .registrar import *
-from .zone_template import *
-from .record_template import *
-
-# +
-# Backwards compatibility fix, will be removed in version 1.1
-# -
-from netbox_dns.choices import *

{netbox_plugin_dns-1.2.2 → netbox_plugin_dns-1.2.3}/netbox_dns/templates/netbox_dns/recordtemplate.html

@@ -25,6 +25,12 @@
                     <td style="word-break:break-all;">{{ unicode_name }}</td>
                 </tr>
                 {% endif %}
+                {% if object.description %}
+                <tr>
+                    <th scope="row">{% trans "Description" %}</th>
+                    <td style="word-break:break-all;">{{ object.description }}</td>
+                </tr>
+                {% endif %}
                 {% if object.tenant %}
                 <tr>
                     <th scope="row">{% trans "Tenant" %}</th>
@@ -64,12 +70,6 @@
                     <th scope="row">{% trans "Status" %}</th>
                     <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
                 </tr>
-                {% if object.description %}
-                <tr>
-                    <th scope="row">{% trans "Description" %}</th>
-                    <td style="word-break:break-all;">{{ object.description }}</td>
-                </tr>
-                {% endif %}
             </table>
         </div>
         {% include 'inc/panels/custom_fields.html' %}