netbox-plugin-dns 0.21.2__py3-none-any.whl → 0.21.4__py3-none-any.whl

netbox_dns/__init__.py

@@ -9,7 +9,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.21.2"
+__version__ = "0.21.4"
 
 
 class DNSConfig(PluginConfig):

netbox_dns/migrations/0027_alter_registrar_iana_id.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-11-16 14:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("netbox_dns", "0026_domain_registration"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="registrar",
+            name="iana_id",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]

netbox_dns/models/registrar.py

@@ -15,6 +15,7 @@ class Registrar(NetBoxModel):
     )
     iana_id = models.IntegerField(
         verbose_name="IANA ID",
+        null=True,
         blank=True,
     )
     referral_url = models.URLField(

netbox_dns/validators.py

@@ -10,8 +10,9 @@ except ImportError:
     from extras.plugins.utils import get_plugin_config
 
 LABEL = r"[a-z0-9][a-z0-9-]*(?<!-)"
-UNDERSCORE_LABEL = r"[a-z0-9][a-z0-9-_]*(?<![-_])"
+TOLERANT_LABEL = r"[a-z0-9][a-z0-9-_]*(?<![-_])"
 LEADING_UNDERSCORE_LABEL = r"[a-z0-9_][a-z0-9-]*(?<!-)"
+TOLERANT_LEADING_UNDERSCORE_LABEL = r"[a-z0-9_][a-z0-9-_]*(?<![-_])"
 
 
 def has_invalid_double_dash(name):
@@ -20,7 +21,7 @@ def has_invalid_double_dash(name):
 
 def validate_fqdn(name):
     if get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
-        regex = rf"^(\*|{UNDERSCORE_LABEL})(\.{UNDERSCORE_LABEL})+\.?$"
+        regex = rf"^(\*|{TOLERANT_LABEL})(\.{TOLERANT_LABEL})+\.?$"
     else:
         regex = rf"^(\*|{LABEL})(\.{LABEL})+\.?$"
 
@@ -30,9 +31,12 @@ def validate_fqdn(name):
 
 def validate_extended_hostname(name, tolerate_leading_underscores=False):
     if tolerate_leading_underscores:
-        regex = rf"^([*@]|(\*\.)?{LEADING_UNDERSCORE_LABEL}(\.{LEADING_UNDERSCORE_LABEL})*\.?)$"
+        if get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
+            regex = rf"^([*@]|(\*\.)?{TOLERANT_LEADING_UNDERSCORE_LABEL}(\.{TOLERANT_LEADING_UNDERSCORE_LABEL})*\.?)$"
+        else:
+            regex = rf"^([*@]|(\*\.)?{LEADING_UNDERSCORE_LABEL}(\.{LEADING_UNDERSCORE_LABEL})*\.?)$"
     elif get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
-        regex = rf"^([*@]|(\*\.)?{UNDERSCORE_LABEL}(\.{UNDERSCORE_LABEL})*\.?)$"
+        regex = rf"^([*@]|(\*\.)?{TOLERANT_LABEL}(\.{TOLERANT_LABEL})*\.?)$"
     else:
         regex = rf"^([*@]|(\*\.)?{LABEL}(\.{LABEL})*\.?)$"
 
@@ -45,7 +49,7 @@ def validate_domain_name(name):
         return
 
     if get_plugin_config("netbox_dns", "tolerate_underscores_in_hostnames"):
-        regex = rf"^{UNDERSCORE_LABEL}(\.{UNDERSCORE_LABEL})*\.?$"
+        regex = rf"^{TOLERANT_LABEL}(\.{TOLERANT_LABEL})*\.?$"
     else:
         regex = rf"^{LABEL}(\.{LABEL})*\.?$"
 

{netbox_plugin_dns-0.21.2.dist-info → netbox_plugin_dns-0.21.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.21.2
+Version: 0.21.4
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT

{netbox_plugin_dns-0.21.2.dist-info → netbox_plugin_dns-0.21.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-netbox_dns/__init__.py,sha256=aDeJgr38rX-ypzqWhiWvljH7OKPOssQOe5uirfExAKo,2320
+netbox_dns/__init__.py,sha256=dgBrcfNXZvdNommqv3m17mSyrwClvIilTqKQkBMymKg,2320
 netbox_dns/api/nested_serializers.py,sha256=Do1wWwWrZ5a4OUuW0Sj8AU3AVlaCu675PAG78RT3dv4,2616
 netbox_dns/api/serializers.py,sha256=RXSETFLwRZQrUus8uzMt7q7wuB-QVoiHBQumQQxyX3s,7673
 netbox_dns/api/urls.py,sha256=R9VmmWtdrjvr35i5d_SfZK2lGn6JzmPuWEKTQlZ8MJo,575
@@ -60,12 +60,13 @@ netbox_dns/migrations/0023_alter_record_value.py,sha256=4_4v8YZzU8_jadJqIUUjH6SI
 netbox_dns/migrations/0024_tenancy.py,sha256=3kc5l5_AyfhOI6g6mbCfReUAbSgb2DAv0MDMZqJ-3YQ,1745
 netbox_dns/migrations/0025_ipam_coupling_cf.py,sha256=7uHujclWrsYw5QMLWft0Po78Ow5Q8MjPuU7moKyQ2qs,620
 netbox_dns/migrations/0026_domain_registration.py,sha256=iBgyZZfsy3MOBl1UoDNWHOq0VZH35-_EuK-ShieaImA,5818
+netbox_dns/migrations/0027_alter_registrar_iana_id.py,sha256=QUtRIrqqfkraFmzzeJFZWAEv4PfrOouoHtrV6FRn8Kc,404
 netbox_dns/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_dns/models/__init__.py,sha256=uqpVU1z4DiQWq_PimqAbtKX89bvgEsKa0vMOafMlSSY,136
 netbox_dns/models/contact.py,sha256=Mzj4SR3fczOE96etWjObJElk0RVQetNuXZVtm8sS1h8,2849
 netbox_dns/models/nameserver.py,sha256=SjKUbMRNE3TSDzmxbKFR9b4AfYPS0UPj0QeO7XpwNRk,2941
 netbox_dns/models/record.py,sha256=k-A0HeYgNiQAkyTFV7Sm26PtQJRIbwuvUEjXtHsa9tY,14048
-netbox_dns/models/registrar.py,sha256=5JhOvSLoYmWrlfj7koXR4apKYQDUFn7Iipjwo0z7dRc,1397
+netbox_dns/models/registrar.py,sha256=ByKHeqH5KfswqOLjya8DZExJ1omSKFHMfCjIIYfnwTo,1416
 netbox_dns/models/view.py,sha256=ljs3Q2xQR63ZOSyja5H7DEdFbm7MX2ZjlR6uNVrAsVo,920
 netbox_dns/models/zone.py,sha256=wfOgvGnu8aT0A6xwthI0KDFSU3XY-R-Ut75mJ5-GkfQ,18076
 netbox_dns/navigation.py,sha256=IutEr_TcPgDGzqTT1ZzV4IUABLSOFU9v364BfpCqbro,4587
@@ -95,7 +96,7 @@ netbox_dns/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 netbox_dns/templatetags/view_helpers.py,sha256=M7ND-gQhPTey_4wlhalthucqKJf8UjjP4LGuHMw3j-c,271
 netbox_dns/urls.py,sha256=RMEDiyEmtHQzbjKy65ud6LofQYoEziIH7BvRaVs7kn0,8020
 netbox_dns/utilities.py,sha256=UjYHNp3RxToJgjOLs6iPn5ekETCpES2yWUfuqJXkDyU,1915
-netbox_dns/validators.py,sha256=WfYomXxHnk908-AIbS19fwa0NyumGDYoMoscJm4twt4,1959
+netbox_dns/validators.py,sha256=mauW5-7a-sjTxyP4qWiRi-kfffGEj9Ma7N2o-BJjx38,2232
 netbox_dns/views/__init__.py,sha256=Aw8HrCTjaJfu5JSwJsQRHfOUz4zKwAmZNByT9q6BrFU,136
 netbox_dns/views/contact.py,sha256=6-oCfK98-submcUTmi0ejw7QBscNn3S9bnS0oUTXOaY,2235
 netbox_dns/views/nameserver.py,sha256=Wa8CQ19P5uPNLMIYkj_U82wmwdp5gZoBWZnOR4ZExa0,2990
@@ -103,7 +104,7 @@ netbox_dns/views/record.py,sha256=eT-M-rqhCrcmhpEyKOnQ8SWnxAVUgams5e86nVL9uc0,25
 netbox_dns/views/registrar.py,sha256=aznSKt1L5tILMLGgcZiBR7u7B8rNl-jM1B2-N0fTeK8,2072
 netbox_dns/views/view.py,sha256=uUvtlNEh5MYoEALvWWaCOqj_Zj8dpGOL2PUyg-UPfEA,1895
 netbox_dns/views/zone.py,sha256=j1wxqEQKYxkQv2DqOHo0gP6e_hZrD2RTyZhkx5CCXFE,3988
-netbox_plugin_dns-0.21.2.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
-netbox_plugin_dns-0.21.2.dist-info/METADATA,sha256=0ao4kLVbrFi5VHbpBGdls1B3mR4kXADV0zsHdNnFbFQ,3931
-netbox_plugin_dns-0.21.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-netbox_plugin_dns-0.21.2.dist-info/RECORD,,
+netbox_plugin_dns-0.21.4.dist-info/LICENSE,sha256=tziMJKpkMbySr09L6bIwsu7Ca9ICoqpMO3yAXgEMQA4,1076
+netbox_plugin_dns-0.21.4.dist-info/METADATA,sha256=lk59DRiIpPahWXSNUAjohLx2Bl9s6CEpNOOTofzDBOk,3931
+netbox_plugin_dns-0.21.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+netbox_plugin_dns-0.21.4.dist-info/RECORD,,