netbox-plugin-dns 0.22.9__py3-none-any.whl → 1.0b1__py3-none-any.whl

netbox_dns/models/record.py

@@ -7,7 +7,6 @@ from dns import name as dns_name
 from django.core.exceptions import ValidationError
 from django.db import transaction, models
 from django.db.models import Q, ExpressionWrapper, BooleanField, Min
-from django.db.models.functions import Length
 from django.urls import reverse
 
 from netbox.models import NetBoxModel
@@ -15,12 +14,7 @@ from netbox.search import SearchIndex, register_search
 from utilities.querysets import RestrictedQuerySet
 from utilities.choices import ChoiceSet
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 from netbox_dns.fields import AddressField
 from netbox_dns.utilities import (
@@ -43,7 +37,9 @@ def min_ttl(*ttl_list):
 
 
 class RecordManager(models.Manager.from_queryset(RestrictedQuerySet)):
-    """Special Manager for records providing the activity status annotation"""
+    """
+    Custom manager for records providing the activity status annotation
+    """
 
     def get_queryset(self):
         return (
@@ -218,7 +214,7 @@ class Record(NetBoxModel):
             name = dns_name.from_text(self.fqdn).relativize(dns_name.root).to_unicode()
         except dns_name.IDNAException:
             name = self.name
-        except dns_name.LabelTooLong as exc:
+        except dns_name.LabelTooLong:
             name = f"{self.name[:59]}..."
 
         return f"{name} [{self.type}]"
@@ -231,7 +227,7 @@ class Record(NetBoxModel):
         return RecordStatusChoices.colors.get(self.status)
 
     def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:record", kwargs={"pk": self.id})
+        return reverse("plugins:netbox_dns:record", kwargs={"pk": self.pk})
 
     @property
     def value_fqdn(self):
@@ -669,7 +665,7 @@ class Record(NetBoxModel):
         if self.type == RecordTypeChoices.SOA and self.name != "@":
             raise ValidationError(
                 {
-                    "name": f"SOA records are only allowed with name @ and are created automatically by NetBox DNS"
+                    "name": "SOA records are only allowed with name @ and are created automatically by NetBox DNS"
                 }
             ) from None
 
@@ -699,8 +695,6 @@ class Record(NetBoxModel):
                     }
                 ) from None
 
-        super().clean(*args, **kwargs)
-
     def save(
         self,
         *args,
@@ -760,8 +754,7 @@ class Record(NetBoxModel):
 class RecordIndex(SearchIndex):
     model = Record
     fields = (
-        ("fqdn", 100),
-        ("name", 120),
+        ("name", 100),
         ("value", 150),
         ("zone", 200),
         ("type", 200),

netbox_dns/models/registrar.py

@@ -13,6 +13,10 @@ class Registrar(NetBoxModel):
         unique=True,
         max_length=255,
     )
+    description = models.CharField(
+        blank=True,
+        max_length=200,
+    )
     iana_id = models.IntegerField(
         verbose_name="IANA ID",
         null=True,
@@ -43,7 +47,7 @@ class Registrar(NetBoxModel):
     )
 
     def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:registrar", kwargs={"pk": self.id})
+        return reverse("plugins:netbox_dns:registrar", kwargs={"pk": self.pk})
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/view.py

@@ -25,7 +25,7 @@ class View(NetBoxModel):
     clone_fields = ["name", "description"]
 
     def get_absolute_url(self):
-        return reverse("plugins:netbox_dns:view", kwargs={"pk": self.id})
+        return reverse("plugins:netbox_dns:view", kwargs={"pk": self.pk})
 
     def __str__(self):
         return str(self.name)

netbox_dns/models/zone.py

@@ -22,12 +22,7 @@ from utilities.querysets import RestrictedQuerySet
 from utilities.choices import ChoiceSet
 from ipam.models import IPAddress
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 from netbox_dns.fields import NetworkField, RFC2317NetworkField
 from netbox_dns.utilities import (
@@ -48,7 +43,9 @@ import netbox_dns.models.record as record
 
 
 class ZoneManager(models.Manager.from_queryset(RestrictedQuerySet)):
-    """Special Manager for zones providing the activity status annotation"""
+    """
+    Custom manager for zones providing the activity status annotation
+    """
 
     def get_queryset(self):
         return (
@@ -455,7 +452,7 @@ class Zone(NetBoxModel):
         return ns_warnings, ns_errors
 
     def get_auto_serial(self):
-        records = record.Record.objects.filter(zone=self).exclude(
+        records = record.Record.objects.filter(zone_id=self.pk).exclude(
             type=record.RecordTypeChoices.SOA
         )
         if records:
@@ -603,7 +600,7 @@ class Zone(NetBoxModel):
             if self.arpa_network is not None:
                 raise ValidationError(
                     {
-                        "rfc2317_prefix": f"A regular reverse zone can not be used as an RFC2317 zone."
+                        "rfc2317_prefix": "A regular reverse zone can not be used as an RFC2317 zone."
                     }
                 )
 

netbox_dns/navigation.py

@@ -1,6 +1,4 @@
-from extras.plugins import PluginMenuButton, PluginMenuItem
-from extras.plugins import PluginMenu
-from utilities.choices import ButtonColorChoices
+from netbox.plugins import PluginMenuButton, PluginMenuItem, PluginMenu
 
 view_menu_item = PluginMenuItem(
     link="plugins:netbox_dns:view_list",
@@ -11,14 +9,12 @@ view_menu_item = PluginMenuItem(
             "plugins:netbox_dns:view_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_view"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:view_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_view"],
         ),
     ),
@@ -33,14 +29,12 @@ zone_menu_item = PluginMenuItem(
             "plugins:netbox_dns:zone_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_zone"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:zone_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_zone"],
         ),
     ),
@@ -55,14 +49,12 @@ nameserver_menu_item = PluginMenuItem(
             "plugins:netbox_dns:nameserver_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_nameserver"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:nameserver_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_nameserver"],
         ),
     ),
@@ -77,14 +69,12 @@ record_menu_item = PluginMenuItem(
             "plugins:netbox_dns:record_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_record"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:record_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_record"],
         ),
     ),
@@ -105,14 +95,12 @@ registrar_menu_item = PluginMenuItem(
             "plugins:netbox_dns:registrar_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_registrar"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:registrar_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_registrar"],
         ),
     ),
@@ -127,14 +115,12 @@ contact_menu_item = PluginMenuItem(
             "plugins:netbox_dns:contact_add",
             "Add",
             "mdi mdi-plus-thick",
-            ButtonColorChoices.GREEN,
             permissions=["netbox_dns.add_contact"],
         ),
         PluginMenuButton(
             "plugins:netbox_dns:contact_import",
             "Import",
             "mdi mdi-upload",
-            ButtonColorChoices.CYAN,
             permissions=["netbox_dns.add_contact"],
         ),
     ),

netbox_dns/signals/ipam_coupling.py

@@ -18,12 +18,7 @@ from netbox_dns.utilities.ipam_coupling import (
     DNSPermissionDenied,
 )
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
+from netbox.plugins.utils import get_plugin_config
 
 
 @receiver(post_clean, sender=IPAddress)
@@ -39,14 +34,14 @@ def ip_address_check_permissions_save(instance, **kwargs):
         return
 
     try:
-        if instance.id is None:
+        if instance.pk is None:
             record = new_address_record(instance)
             if record is not None:
                 record.full_clean()
                 check_permission(request, "netbox_dns.add_record", record)
 
         else:
-            if not dns_changed(IPAddress.objects.get(pk=instance.id), instance):
+            if not dns_changed(IPAddress.objects.get(pk=instance.pk), instance):
                 return
 
             record = get_address_record(instance)

netbox_dns/tables/contact.py

@@ -18,6 +18,7 @@ class ContactTable(NetBoxTable):
         fields = (
             "contact_id",
             "name",
+            "description",
             "organization",
             "street",
             "city",

netbox_dns/tables/nameserver.py

@@ -7,8 +7,6 @@ from netbox_dns.models import NameServer
 
 
 class NameServerTable(TenancyColumnsMixin, NetBoxTable):
-    """Table for displaying NameServer objects."""
-
     name = tables.Column(
         linkify=True,
     )

netbox_dns/tables/registrar.py

@@ -17,6 +17,7 @@ class RegistrarTable(NetBoxTable):
         model = Registrar
         fields = (
             "name",
+            "description",
             "iana_id",
             "referral_url",
             "whois_server",

netbox_dns/template_content.py

@@ -1,13 +1,9 @@
 from packaging import version
+
 from django.conf import settings
 
-try:
-    # NetBox 3.5.0 - 3.5.7, 3.5.9+
-    from extras.plugins import get_plugin_config
-except ImportError:
-    # NetBox 3.5.8
-    from extras.plugins.utils import get_plugin_config
-from extras.plugins import PluginTemplateExtension
+from netbox.plugins.utils import get_plugin_config
+from netbox.plugins import PluginTemplateExtension
 
 from netbox_dns.models import Record, RecordTypeChoices, Zone, View, NameServer
 from netbox_dns.tables import RelatedRecordTable

netbox_dns/templates/netbox_dns/contact.html

@@ -5,62 +5,66 @@
         <div class="col col-md-6">
             <div class="card">
                 <h5 class="card-header">Contact</h5>
-                <div class="card-body">
-                    <table class="table table-hover attr-table">
-                        <tr>
-                            <th scope="row">Name</th>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Contact ID</th>
-                            <td>{{ object.contact_id }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Organization</th>
-                            <td>{{ object.organization }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Street</th>
-                            <td>{{ object.street }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">City</th>
-                            <td>{{ object.city }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">State/Province</th>
-                            <td>{{ object.state_province }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Postal Code</th>
-                            <td>{{ object.postal_code }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Country</th>
-                            <td>{{ object.country }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Phone</th>
-                            <td>{{ object.phone }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Phone Extension</th>
-                            <td>{{ object.phone_ext }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Fax</th>
-                            <td>{{ object.fax }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Fax Extension</th>
-                            <td>{{ object.fax_ext }}</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Email</th>
-                            <td>{{ object.email }}</td>
-                        </tr>
-                    </table>
-                </div>
+                <table class="table table-hover attr-table">
+                    <tr>
+                        <th scope="row">Name</th>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                     {% if object.description %}
+                    <tr>
+                        <th scope="row">Description</th>
+                        <td style="word-break:break-all;">{{ object.description }}</td>
+                    </tr>
+                    {% endif %}
+                   <tr>
+                        <th scope="row">Contact ID</th>
+                        <td>{{ object.contact_id }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Organization</th>
+                        <td>{{ object.organization }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Street</th>
+                        <td>{{ object.street }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">City</th>
+                        <td>{{ object.city }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">State/Province</th>
+                        <td>{{ object.state_province }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Postal Code</th>
+                        <td>{{ object.postal_code }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Country</th>
+                        <td>{{ object.country }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Phone</th>
+                        <td>{{ object.phone }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Phone Extension</th>
+                        <td>{{ object.phone_ext }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Fax</th>
+                        <td>{{ object.fax }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Fax Extension</th>
+                        <td>{{ object.fax_ext }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">Email</th>
+                        <td>{{ object.email }}</td>
+                    </tr>
+                </table>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
         </div>

netbox_dns/templates/netbox_dns/nameserver.html

@@ -5,33 +5,33 @@
         <div class="col col-md-6">
             <div class="card">
                 <h5 class="card-header">Name Server</h5>
-                <div class="card-body">
-                    <table class="table table-hover attr-table">
-                        <tr>
-                            <th scope="row">Name</th>
-                            <td>{{ object.name }}</td>
-                        </tr>
-                        {% if unicode_name %}
-                            <tr>
-                                <th scope="row">IDN</th>
-                                <td>{{ unicode_name }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <th scope="row">Tenant</th>
-                            <td>
-                                {% if object.tenant.group %}
-                                    {{ object.tenant.group|linkify }} /
-                                {% endif %}
-                                {{ object.tenant|linkify|placeholder }}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Description</th>
-                            <td>{{ object.description }}</td>
-                        </tr>
-                    </table>
-                </div>
+                <table class="table table-hover attr-table">
+                    <tr>
+                        <th scope="row">Name</th>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    {% if unicode_name %}
+                    <tr>
+                        <th scope="row">IDN</th>
+                        <td>{{ unicode_name }}</td>
+                    </tr>
+                    {% endif %}
+                    {% if object.description %}
+                    <tr>
+                        <th scope="row">Description</th>
+                        <td style="word-break:break-all;">{{ object.description }}</td>
+                    </tr>
+                    {% endif %}
+                    <tr>
+                        <th scope="row">Tenant</th>
+                        <td>
+                            {% if object.tenant.group %}
+                                {{ object.tenant.group|linkify }} /
+                            {% endif %}
+                            {{ object.tenant|linkify|placeholder }}
+                        </td>
+                    </tr>
+                </table>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
         </div>