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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.1
+Version: 1.2.2
 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
@@ -66,9 +66,19 @@ For integration with a large number of DNS server implementations integration to
 
 ## Requirements
 
-* NetBox 4.0.0 or higher
+* NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
+## Compatibility with earlier NetBox Versions
+
+NetBox Version | NetBox DNS Version | Comment
+-------------- | ------------------ | -------
+3.5            | 0.22               |
+3.6            | 0.22               |
+3.7            | 0.22               |
+4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
+4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+
 ## Installation & Configuration
 
 ### Installation

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

@@ -50,9 +50,19 @@ For integration with a large number of DNS server implementations integration to
 
 ## Requirements
 
-* NetBox 4.0.0 or higher
+* NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
+## Compatibility with earlier NetBox Versions
+
+NetBox Version | NetBox DNS Version | Comment
+-------------- | ------------------ | -------
+3.5            | 0.22               |
+3.6            | 0.22               |
+3.7            | 0.22               |
+4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
+4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+
 ## Installation & Configuration
 
 ### Installation

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

@@ -7,7 +7,7 @@ from ipam.choices import IPAddressStatusChoices
 
 from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices, ZoneStatusChoices
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 
 def _check_list(setting):
@@ -36,6 +36,7 @@ class DNSConfig(PluginConfig):
             ZoneStatusChoices.STATUS_ACTIVE,
             ZoneStatusChoices.STATUS_DYNAMIC,
         ],
+        "filter_record_types": [],
         "record_active_status": [
             RecordStatusChoices.STATUS_ACTIVE,
         ],

netbox_plugin_dns-1.2.2/netbox_dns/choices/record.py

@@ -0,0 +1,80 @@
+from dns import rdatatype, rdataclass
+
+from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ImproperlyConfigured
+
+from netbox.plugins.utils import get_plugin_config
+from utilities.choices import ChoiceSet
+
+
+__all__ = (
+    "RecordTypeChoices",
+    "RecordSelectableTypeChoices",
+    "RecordClassChoices",
+    "RecordStatusChoices",
+)
+
+
+def define_choice_attributes(filter_name=None):
+    try:
+        if filter_name is not None:
+            filter_choices = get_plugin_config("netbox_dns", filter_name, [])
+        else:
+            filter_choices = []
+    except ImproperlyConfigured:
+        filter_choices = []
+
+    def decorator(cls):
+        choices = []
+        for choice in cls._choices:
+            if choice[0] not in filter_choices:
+                setattr(cls, choice[0], choice[0])
+                choices.append(choice)
+        cls._choices = choices
+        cls.CHOICES = choices
+
+        return cls
+
+    return decorator
+
+
+@define_choice_attributes()
+class RecordTypeChoices(ChoiceSet):
+    CHOICES = [
+        (rdtype.name, rdtype.name)
+        for rdtype in sorted(rdatatype.RdataType, key=lambda a: a.name)
+        if not rdatatype.is_metatype(rdtype)
+    ]
+    SINGLETONS = [
+        rdtype.name for rdtype in rdatatype.RdataType if rdatatype.is_singleton(rdtype)
+    ]
+
+
+@define_choice_attributes(filter_name="filter_record_types")
+class RecordSelectableTypeChoices(ChoiceSet):
+    CHOICES = [
+        (rdtype.name, rdtype.name)
+        for rdtype in sorted(rdatatype.RdataType, key=lambda a: a.name)
+        if not rdatatype.is_metatype(rdtype)
+    ]
+
+
+@define_choice_attributes()
+class RecordClassChoices(ChoiceSet):
+    CHOICES = [
+        (rdclass.name, rdclass.name)
+        for rdclass in sorted(rdataclass.RdataClass)
+        if not rdataclass.is_metaclass(rdclass)
+    ]
+
+
+class RecordStatusChoices(ChoiceSet):
+    key = "Record.status"
+
+    STATUS_ACTIVE = "active"
+    STATUS_INACTIVE = "inactive"
+
+    CHOICES = [
+        (STATUS_ACTIVE, _("Active"), "blue"),
+        (STATUS_INACTIVE, _("Inactive"), "red"),
+    ]

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/forms/record.py

@@ -21,7 +21,7 @@ from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import View, Zone, Record
-from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
+from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
 
 
@@ -57,6 +57,11 @@ class RecordForm(TenancyForm, NetBoxModelForm):
         },
         label=_("Zone"),
     )
+    type = forms.ChoiceField(
+        choices=add_blank_choice(RecordSelectableTypeChoices),
+        required=True,
+        label=_("Type"),
+    )
 
     disable_ptr = forms.BooleanField(
         required=False,
@@ -123,7 +128,7 @@ class RecordFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
 
     type = forms.MultipleChoiceField(
-        choices=RecordTypeChoices,
+        choices=RecordSelectableTypeChoices,
         required=False,
         label=_("Type"),
     )
@@ -210,7 +215,7 @@ class RecordImportForm(NetBoxModelImportForm):
         help_text=_("This field is required if the zone is not in the default view"),
     )
     type = CSVChoiceField(
-        choices=RecordTypeChoices,
+        choices=RecordSelectableTypeChoices,
         required=True,
         label=_("Type"),
     )
@@ -268,7 +273,7 @@ class RecordBulkEditForm(NetBoxModelBulkEditForm):
         label=_("Zone"),
     )
     type = forms.ChoiceField(
-        choices=add_blank_choice(RecordTypeChoices),
+        choices=add_blank_choice(RecordSelectableTypeChoices),
         required=False,
         label=_("Type"),
     )

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/forms/record_template.py

@@ -21,7 +21,7 @@ from tenancy.models import Tenant, TenantGroup
 from tenancy.forms import TenancyForm, TenancyFilterForm
 
 from netbox_dns.models import RecordTemplate, ZoneTemplate
-from netbox_dns.choices import RecordTypeChoices, RecordStatusChoices
+from netbox_dns.choices import RecordSelectableTypeChoices, RecordStatusChoices
 from netbox_dns.utilities import name_to_unicode
 
 
@@ -41,6 +41,11 @@ class RecordTemplateForm(TenancyForm, NetBoxModelForm):
         if initial_record_name:
             self.initial["record_name"] = name_to_unicode(initial_record_name)
 
+    type = forms.ChoiceField(
+        choices=add_blank_choice(RecordSelectableTypeChoices),
+        required=True,
+        label=_("Type"),
+    )
     disable_ptr = forms.BooleanField(
         required=False,
         label=_("Disable PTR"),
@@ -103,7 +108,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     )
 
     type = forms.MultipleChoiceField(
-        choices=RecordTypeChoices,
+        choices=RecordSelectableTypeChoices,
         required=False,
         label=_("Type"),
     )
@@ -142,7 +147,7 @@ class RecordTemplateFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
 
 class RecordTemplateImportForm(NetBoxModelImportForm):
     type = CSVChoiceField(
-        choices=RecordTypeChoices,
+        choices=RecordSelectableTypeChoices,
         required=True,
         label=_("Type"),
     )
@@ -187,7 +192,7 @@ class RecordTemplateBulkEditForm(NetBoxModelBulkEditForm):
     model = RecordTemplate
 
     type = forms.ChoiceField(
-        choices=add_blank_choice(RecordTypeChoices),
+        choices=add_blank_choice(RecordSelectableTypeChoices),
         required=False,
         label=_("Type"),
     )

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/models/nameserver.py

@@ -50,6 +50,7 @@ class NameServer(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     clone_fields = (
         "name",
         "description",
+        "tenant",
     )
 
     class Meta:

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/models/record.py

@@ -227,6 +227,7 @@ class Record(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "ttl",
         "disable_ptr",
         "description",
+        "tenant",
     )
 
     class Meta:

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/models/view.py

@@ -64,6 +64,7 @@ class View(ObjectModificationMixin, ContactsMixin, NetBoxModel):
     clone_fields = (
         "name",
         "description",
+        "tenant",
     )
 
     @classmethod

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_dns/models/zone.py

@@ -271,6 +271,7 @@ class Zone(ObjectModificationMixin, ContactsMixin, NetBoxModel):
         "soa_expire",
         "soa_minimum",
         "description",
+        "tenant",
     )
 
     class Meta:

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

@@ -1,6 +1,8 @@
 {% extends 'netbox_dns/zone/base.html' %}
 {% load helpers %}
 {% load i18n %}
+{% load netbox_dns %}
+{% load tz %}
 
 {% block content %}
 <div class="row">
@@ -118,7 +120,14 @@
                 {% if object.soa_serial_auto %}
                 <tr>
                     <th scope="row">{% trans "Serial (auto-generated)" %}</th>
-                    <td>{{ object.soa_serial }}</td>
+                    <td>
+                        <table style="width: 100%;">
+                            <tr>
+                                <td>{{ object.soa_serial }}</td>
+                                <td align="right" class="text-muted">{{ object.soa_serial|epoch_to_utc|isodatetime }}</td>
+                           </tr>
+                       </table>
+                   </td>
                 </tr>
                 {% else %}
                 <tr>

netbox_plugin_dns-1.2.2/netbox_dns/templatetags/netbox_dns.py

@@ -0,0 +1,10 @@
+from datetime import datetime, timezone
+
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name="epoch_to_utc")
+def epoch_to_utc(epoch):
+    return datetime.fromtimestamp(epoch, tz=timezone.utc)

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

@@ -28,7 +28,7 @@ def _get_label(tolerate_leading_underscores=False, always_tolerant=False):
 
     tolerate_underscores = get_plugin_config(
         "netbox_dns", "tolerate_underscores_in_labels"
-    ) or get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames")
+    )
 
     if tolerate_leading_underscores:
         if tolerate_underscores:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: netbox-plugin-dns
-Version: 1.2.1
+Version: 1.2.2
 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
@@ -66,9 +66,19 @@ For integration with a large number of DNS server implementations integration to
 
 ## Requirements
 
-* NetBox 4.0.0 or higher
+* NetBox 4.2.0 or higher
 * Python 3.10 or higher
 
+## Compatibility with earlier NetBox Versions
+
+NetBox Version | NetBox DNS Version | Comment
+-------------- | ------------------ | -------
+3.5            | 0.22               |
+3.6            | 0.22               |
+3.7            | 0.22               |
+4.0 - 4.1      | 1.0                | Supports legacy IPAM Coupling
+4.0 - 4.1      | 1.1                | Supports IPAM DNSsync
+
 ## Installation & Configuration
 
 ### Installation

{netbox_plugin_dns-1.2.1 → netbox_plugin_dns-1.2.2}/netbox_plugin_dns.egg-info/SOURCES.txt

@@ -125,6 +125,8 @@ netbox_dns/templates/netbox_dns/zone/managed_record.html
 netbox_dns/templates/netbox_dns/zone/record.html
 netbox_dns/templates/netbox_dns/zone/registration.html
 netbox_dns/templates/netbox_dns/zone/rfc2317_child_zone.html
+netbox_dns/templatetags/__init__.py
+netbox_dns/templatetags/netbox_dns.py
 netbox_dns/utilities/__init__.py
 netbox_dns/utilities/conversions.py
 netbox_dns/utilities/dns.py

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

@@ -1,6 +1,6 @@
 [project]
 name = "netbox-plugin-dns"
-version = "1.2.1"
+version = "1.2.2"
 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.1/netbox_dns/choices/record.py

@@ -1,51 +0,0 @@
-from dns import rdatatype, rdataclass
-
-from django.utils.translation import gettext_lazy as _
-
-from utilities.choices import ChoiceSet
-
-
-def initialize_choice_names(cls):
-    for choice in cls.CHOICES:
-        setattr(cls, choice[0], choice[0])
-    return cls
-
-
-__all__ = (
-    "RecordTypeChoices",
-    "RecordClassChoices",
-    "RecordStatusChoices",
-)
-
-
-@initialize_choice_names
-class RecordTypeChoices(ChoiceSet):
-    CHOICES = [
-        (rdtype.name, rdtype.name)
-        for rdtype in sorted(rdatatype.RdataType, key=lambda a: a.name)
-        if not rdatatype.is_metatype(rdtype)
-    ]
-    SINGLETONS = [
-        rdtype.name for rdtype in rdatatype.RdataType if rdatatype.is_singleton(rdtype)
-    ]
-
-
-@initialize_choice_names
-class RecordClassChoices(ChoiceSet):
-    CHOICES = [
-        (rdclass.name, rdclass.name)
-        for rdclass in sorted(rdataclass.RdataClass)
-        if not rdataclass.is_metaclass(rdclass)
-    ]
-
-
-class RecordStatusChoices(ChoiceSet):
-    key = "Record.status"
-
-    STATUS_ACTIVE = "active"
-    STATUS_INACTIVE = "inactive"
-
-    CHOICES = [
-        (STATUS_ACTIVE, _("Active"), "blue"),
-        (STATUS_INACTIVE, _("Inactive"), "red"),
-    ]