netbox-plugin-dns 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

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_dns/choices/record.py

@@ -1,24 +1,44 @@
 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
 
 
-def initialize_choice_names(cls):
-    for choice in cls.CHOICES:
-        setattr(cls, choice[0], choice[0])
-    return cls
-
-
 __all__ = (
     "RecordTypeChoices",
+    "RecordSelectableTypeChoices",
     "RecordClassChoices",
     "RecordStatusChoices",
 )
 
 
-@initialize_choice_names
+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)
@@ -30,7 +50,16 @@ class RecordTypeChoices(ChoiceSet):
     ]
 
 
-@initialize_choice_names
+@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)

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_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_dns/models/nameserver.py

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

netbox_dns/models/record.py

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

netbox_dns/models/view.py

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

netbox_dns/models/zone.py

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

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_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_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.dist-info → netbox_plugin_dns-1.2.2.dist-info}/METADATA

@@ -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.dist-info → netbox_plugin_dns-1.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=y1gmAAuUkeTAfa-FMptZlEVfTPn-5U2YC_Mre2RV1pE,3018
+netbox_dns/__init__.py,sha256=WLiNzOodcLZS1ifW8vje3J16M5o4dDYyPmtG8GcMbpY,3053
 netbox_dns/apps.py,sha256=JCW5eS-AQBUubDJve1DjP-IRFKTFGQh1NLGWzJpC5MI,151
 netbox_dns/navigation.py,sha256=36clAzlWftW94_VZ3EHu8_btzzA_dah50CLTfoov-O4,6226
 netbox_dns/template_content.py,sha256=T06L7-m4eGrLMeGsCvPpQLAGfn3S2FL7z0Cd1hhbisY,4225
@@ -18,7 +18,7 @@ netbox_dns/api/serializers_/view.py,sha256=nnWeQugoqMdn-NGGC7ykbVPwmBrcBma_ZKwdD
 netbox_dns/api/serializers_/zone.py,sha256=ELAis8nj9PZlge6zqTQ23P0vC4IJBDa3hh5kZ9T8G_4,5003
 netbox_dns/api/serializers_/zone_template.py,sha256=w0TsrqS_DgIIAUozCC-gc9lsQ67lpVkvbyphyuRzq6Q,3847
 netbox_dns/choices/__init__.py,sha256=jOVs2VGV5SVADRlqVnrFeAy26i8BIeEAbGpiX7K8bL8,42
-netbox_dns/choices/record.py,sha256=wFS44WRyUwiN2ocx-A8ZzVXKpaD9Thb0MrOiMHiqNzU,1175
+netbox_dns/choices/record.py,sha256=ZSpyiZE2YCsF2wF53A5DFWgwCIhkFhgOKt__RJ0KxSk,2084
 netbox_dns/choices/zone.py,sha256=Vblm5RUtNtPNkULh8U1NxBMme1iHPllD6B6LkQkWZW4,621
 netbox_dns/fields/__init__.py,sha256=U1nbFIwwtvr10pp3Sk91jEZeWkVQBSJtr0BVWYgOfiA,89
 netbox_dns/fields/address.py,sha256=qNLHmpwwJ3TevljG1QsUr_f2h6NrPsK6wr-R-Ti8eZI,1262
@@ -36,8 +36,8 @@ netbox_dns/filtersets/zone.py,sha256=zl39SOiYIZxAi3G1wx0s9UEIgh8hG9Bdb46qIXLwMr8
 netbox_dns/filtersets/zone_template.py,sha256=Sm40P33IhN0sOqtjz4JzoBbEK-dTLpfQqYGcM_Xb7KM,3870
 netbox_dns/forms/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
 netbox_dns/forms/nameserver.py,sha256=GJe3ece4yIGwMtLZ6wQihBrJu1dk_ZSiwX-vSU0fRa0,3397
-netbox_dns/forms/record.py,sha256=KctB0Qm62j3FKYj9gqzxEtQypwxpIhnJz4JnxejoI7o,8065
-netbox_dns/forms/record_template.py,sha256=iGlBOOsjkXnyLuRyA5DzSXe4syosxzgdWuACtmDq1Vs,6053
+netbox_dns/forms/record.py,sha256=QNGLqWprhsGFTSlH2YAe-SHmCx1K1QbT_osAhCegyJg,8252
+netbox_dns/forms/record_template.py,sha256=uN6ZSepNilQuqyfPpW-pMfmTRWo0IrDxp1LdOrlAo5A,6240
 netbox_dns/forms/registrar.py,sha256=GaRH3w5zlhrpwy_U0pxlrl1DrAEaMB78MUlnGxBRwZI,3949
 netbox_dns/forms/registration_contact.py,sha256=IhNAqElY7hOdpDG0jwWMdy3y2mB43xmjUhj3lsgJ3SE,5906
 netbox_dns/forms/view.py,sha256=GacwKHXSDvxQEs-d3ys7rietqA_MzpSd0XjWaSsIbU0,10339
@@ -81,13 +81,13 @@ netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 netbox_dns/mixins/__init__.py,sha256=LxTEfpod_RHCyMtnzDljv0_dwqp2z3Q6tqbXW8LTGD8,35
 netbox_dns/mixins/object_modification.py,sha256=AR64fU5f7g-scNAj9b54eSoS9dpjyOpqrxXVXPcOhY8,1807
 netbox_dns/models/__init__.py,sha256=5Ns9RaemTe5L0L3c6a38RxembWhV-sX9cqfjl05aPQw,313
-netbox_dns/models/nameserver.py,sha256=RmUubF05_K1GMOM7e_geoxXIrS8Xbs1al_xsfwmfd0Q,3389
-netbox_dns/models/record.py,sha256=tRzkjdiGIPulzlulQdzEZetObOL_9mhIunZREux6pDg,29397
+netbox_dns/models/nameserver.py,sha256=GKCWPKqg8WLVQS6UYRUyTdVb_865p2io06yYp5Z9b80,3407
+netbox_dns/models/record.py,sha256=7LCLc3mLbgHx5yCMzIItQTB5Jzg8P-1uWGhfYeGpN4U,29415
 netbox_dns/models/record_template.py,sha256=PC4369q_LIJkImp1_jhiTTwy083MXIGpGADnbDHMbqI,5104
 netbox_dns/models/registrar.py,sha256=bjgYgeUtWGg_seDRN1-VV4Pe450ZK85lbALo4J_Zuic,1890
 netbox_dns/models/registration_contact.py,sha256=AkpNy9KbFV9YrISdepqZA1ZfckZSA9u_vfPUAf5Z4H8,3773
-netbox_dns/models/view.py,sha256=SbBsP-WYrJXBJG65PMmXE61uo0VvdLXPOuG1VxWziEs,4738
-netbox_dns/models/zone.py,sha256=iPjiZRpuxeFXqYDINBcjWYQTyJHjRk5UCs9Ap69HZG8,32249
+netbox_dns/models/view.py,sha256=1OGbol3Ekg1G7c6kPRLwTaLW_ugzNozewnaN2SpyOqc,4756
+netbox_dns/models/zone.py,sha256=gq2gnF_ykzZ9kLtiHSm1Lwku-uWU_iFv-0HPlH54JzI,32267
 netbox_dns/models/zone_template.py,sha256=kH16CdFk7OpjSiKfJb3bsBi--Shp2V1Fd7jVRJtbl_4,3945
 netbox_dns/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/signals/ipam_dnssync.py,sha256=1zhlf4cMcJLlFosX7YzyqVYdFFHV4MFwTz5KCdL8xQc,7730
@@ -107,7 +107,7 @@ netbox_dns/templates/netbox_dns/recordtemplate.html,sha256=jQB42mBNlSt-Tq_uQFIyy
 netbox_dns/templates/netbox_dns/registrar.html,sha256=4kJuj3biiDxQrIMQEQUEmF4iGRE4psr6Fh0CBP1evz8,2308
 netbox_dns/templates/netbox_dns/registrationcontact.html,sha256=sljVp_MrPSJRc2vJCPFXq9MiWOw4wjbr1kI_YStBntw,3094
 netbox_dns/templates/netbox_dns/view.html,sha256=TslfDC0ZzGU59iO_OcaX8jvt6fTjWot-wYRqRGRYvLE,3245
-netbox_dns/templates/netbox_dns/zone.html,sha256=9tMvBuZ0hyAIHJB4-tbKmLLHAJ00OzQIIvajqn3uu5s,6619
+netbox_dns/templates/netbox_dns/zone.html,sha256=BushtUbicj9zK6s50LKiaJhs25J0JY3-QHYCnUu8fKY,6991
 netbox_dns/templates/netbox_dns/zonetemplate.html,sha256=z_VJEkf_yNjL9xoVMHG4VHQvuXwBSarA_SoPbjutBgA,3667
 netbox_dns/templates/netbox_dns/record/managed.html,sha256=uwpxQTxyfAXkWqThLT-T2ZssKNUhXTDDMnLWJSVuDNU,119
 netbox_dns/templates/netbox_dns/record/related.html,sha256=R59aPhE4CyIZtTH0ncwDyS6_wAe_Y-oZjuN_j4qk8iA,1158
@@ -122,12 +122,14 @@ netbox_dns/templates/netbox_dns/zone/managed_record.html,sha256=LOchMAJyfMZIICE6
 netbox_dns/templates/netbox_dns/zone/record.html,sha256=Y_gg9EUIqjSYxmIZKufAK8jyg9A54J-BoewNxUBoO1Y,2238
 netbox_dns/templates/netbox_dns/zone/registration.html,sha256=PqniHrO-LnXstIKyjn3fJk69ysjfrrt3U4kZAJqidXI,1265
 netbox_dns/templates/netbox_dns/zone/rfc2317_child_zone.html,sha256=rWlmb3zRQbLYQ_1dsa0twwu6y1dRj2tfFVEERH07p-s,517
+netbox_dns/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+netbox_dns/templatetags/netbox_dns.py,sha256=DND1DMPzv636Rak3M6Hor_Vw6pjqUfSTquofIw4dIsA,223
 netbox_dns/utilities/__init__.py,sha256=cSGf-nGaRWx9b-Xrh3dLMJYoWNsZ6FF-qdmV4F1uOgg,74
 netbox_dns/utilities/conversions.py,sha256=NS37SoMqXc13wNWRkKnLfyQbVi6QKD33fu5ovTKRo74,1979
 netbox_dns/utilities/dns.py,sha256=QKST49UkCw7n2GyrN3wU5ap6Cw98t1SZxFYJlyG2x70,315
 netbox_dns/utilities/ipam_dnssync.py,sha256=tFphPVluDUS3-4NsUW1_D1dDksA3AgIozf7JAoTIE_w,9533
 netbox_dns/validators/__init__.py,sha256=Mr8TvmcJTa8Pubj8TzbFBKfbHhEmGcr5JdQvczEJ39A,72
-netbox_dns/validators/dns_name.py,sha256=D2SVUHkDAdENspDTzvW4qeWdKC_2KcueqNioqgoHrfA,3628
+netbox_dns/validators/dns_name.py,sha256=XC8yv_PeInKtya8FyPnzmazSe7BJcPw_2iK3A5A3ws0,3556
 netbox_dns/validators/dns_value.py,sha256=-mc62mth-hlbPUPe_RlCR7vo1KSD6_gQDXiE8rjB-Cc,5206
 netbox_dns/validators/rfc2317.py,sha256=uKkwxpakiFFKdYA0qy8WSlEnbFwJD4MDw6gGV4F6skg,706
 netbox_dns/views/__init__.py,sha256=axENVF9vX9BtDKCNxrapRjye1NnygUg9BS0BBj6a0io,209
@@ -139,8 +141,8 @@ netbox_dns/views/registration_contact.py,sha256=u__0w4Nm1_5lnAeFXfTY-cD86facWxIo
 netbox_dns/views/view.py,sha256=a6-wdMyTWoZekiR2VnM3VNSOjX-8L3Qjqqi973UobAA,3391
 netbox_dns/views/zone.py,sha256=H7UPN4T_sn_3ijvXi7t8iteJFs6qqEtVzhvchKOOzCM,7133
 netbox_dns/views/zone_template.py,sha256=vNXG96D6uZJo4KRdsgsTL3d9JzRtiDJg4_h4_3gjAfk,2667
-netbox_plugin_dns-1.2.1.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
-netbox_plugin_dns-1.2.1.dist-info/METADATA,sha256=GAb1unCGj5FYGlaPyeTAVUCP4Bs5BWw90ndmMzaCOeQ,7223
-netbox_plugin_dns-1.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-netbox_plugin_dns-1.2.1.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
-netbox_plugin_dns-1.2.1.dist-info/RECORD,,
+netbox_plugin_dns-1.2.2.dist-info/LICENSE,sha256=I3tDu11bZfhFm3EkV4zOD5TmWgLjnUNLEFwrdjniZYs,1112
+netbox_plugin_dns-1.2.2.dist-info/METADATA,sha256=Ef4CV4H2DEOAvT4lQAGFJ21ik_nfeRwEJmFFKXwwmMs,7605
+netbox_plugin_dns-1.2.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+netbox_plugin_dns-1.2.2.dist-info/top_level.txt,sha256=sA1Rwl1mRKvMC6XHe2ylZ1GF-Q1NGd08XedK9Y4xZc4,11
+netbox_plugin_dns-1.2.2.dist-info/RECORD,,