netbox-plugin-dns 1.1.0b7__py3-none-any.whl → 1.1.2__py3-none-any.whl

netbox_dns/urls/registration_contact.py

@@ -0,0 +1,60 @@
+from django.urls import include, path
+
+from utilities.urls import get_model_urls
+
+from netbox_dns.views import (
+    RegistrationContactView,
+    RegistrationContactListView,
+    RegistrationContactEditView,
+    RegistrationContactDeleteView,
+    RegistrationContactBulkImportView,
+    RegistrationContactBulkEditView,
+    RegistrationContactBulkDeleteView,
+)
+
+registrationcontact_urlpatterns = [
+    path(
+        "registrationcontacts/<int:pk>/",
+        RegistrationContactView.as_view(),
+        name="registrationcontact",
+    ),
+    path(
+        "registrationcontacts/",
+        RegistrationContactListView.as_view(),
+        name="registrationcontact_list",
+    ),
+    path(
+        "registrationcontacts/add/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_add",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/edit/",
+        RegistrationContactEditView.as_view(),
+        name="registrationcontact_edit",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/delete/",
+        RegistrationContactDeleteView.as_view(),
+        name="registrationcontact_delete",
+    ),
+    path(
+        "registrationcontacts/import/",
+        RegistrationContactBulkImportView.as_view(),
+        name="registrationcontact_import",
+    ),
+    path(
+        "registrationcontacts/edit/",
+        RegistrationContactBulkEditView.as_view(),
+        name="registrationcontact_bulk_edit",
+    ),
+    path(
+        "registrationcontacts/delete/",
+        RegistrationContactBulkDeleteView.as_view(),
+        name="registrationcontact_bulk_delete",
+    ),
+    path(
+        "registrationcontacts/<int:pk>/",
+        include(get_model_urls("netbox_dns", "registrationcontact")),
+    ),
+]

netbox_dns/urls/view.py

@@ -1,42 +1,28 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import View
 from netbox_dns.views import (
-    ViewListView,
     ViewView,
-    ViewDeleteView,
+    ViewListView,
     ViewEditView,
+    ViewDeleteView,
     ViewBulkImportView,
     ViewBulkEditView,
     ViewBulkDeleteView,
-    ViewZoneListView,
     ViewPrefixEditView,
 )
 
 view_urlpatterns = [
+    path("views/<int:pk>/", ViewView.as_view(), name="view"),
     path("views/", ViewListView.as_view(), name="view_list"),
     path("views/add/", ViewEditView.as_view(), name="view_add"),
+    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
+    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
     path("views/import/", ViewBulkImportView.as_view(), name="view_import"),
     path("views/edit/", ViewBulkEditView.as_view(), name="view_bulk_edit"),
     path("views/delete/", ViewBulkDeleteView.as_view(), name="view_bulk_delete"),
-    path("views/<int:pk>/", ViewView.as_view(), name="view"),
-    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
-    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
-    path("views/<int:pk>/zones/", ViewZoneListView.as_view(), name="view_zones"),
-    path(
-        "views/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="view_journal",
-        kwargs={"model": View},
-    ),
-    path(
-        "views/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="view_changelog",
-        kwargs={"model": View},
-    ),
+    path("views/<int:pk>/", include(get_model_urls("netbox_dns", "view"))),
     path(
         "prefixes/<int:pk>/assign-views/",
         ViewPrefixEditView.as_view(),

netbox_dns/urls/zone.py

@@ -1,63 +1,25 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Zone
 from netbox_dns.views import (
-    ZoneListView,
     ZoneView,
-    ZoneDeleteView,
+    ZoneListView,
     ZoneEditView,
+    ZoneDeleteView,
     ZoneBulkImportView,
     ZoneBulkEditView,
     ZoneBulkDeleteView,
-    ZoneRecordListView,
-    ZoneManagedRecordListView,
-    ZoneRegistrationView,
-    ZoneRFC2317ChildZoneListView,
-    ZoneChildZoneListView,
 )
 
 zone_urlpatterns = [
+    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
     path("zones/", ZoneListView.as_view(), name="zone_list"),
     path("zones/add/", ZoneEditView.as_view(), name="zone_add"),
+    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
+    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
     path("zones/import/", ZoneBulkImportView.as_view(), name="zone_import"),
     path("zones/edit/", ZoneBulkEditView.as_view(), name="zone_bulk_edit"),
     path("zones/delete/", ZoneBulkDeleteView.as_view(), name="zone_bulk_delete"),
-    path("zones/<int:pk>/", ZoneView.as_view(), name="zone"),
-    path("zones/<int:pk>/delete/", ZoneDeleteView.as_view(), name="zone_delete"),
-    path("zones/<int:pk>/edit/", ZoneEditView.as_view(), name="zone_edit"),
-    path("zones/<int:pk>/records/", ZoneRecordListView.as_view(), name="zone_records"),
-    path(
-        "zones/<int:pk>/managedrecords/",
-        ZoneManagedRecordListView.as_view(),
-        name="zone_managed_records",
-    ),
-    path(
-        "zones/<int:pk>/rfc2317childzones/",
-        ZoneRFC2317ChildZoneListView.as_view(),
-        name="zone_rfc2317_child_zones",
-    ),
-    path(
-        "zones/<int:pk>/childzones/",
-        ZoneChildZoneListView.as_view(),
-        name="zone_child_zones",
-    ),
-    path(
-        "zones/<int:pk>/registration/",
-        ZoneRegistrationView.as_view(),
-        name="zone_registration",
-    ),
-    path(
-        "zones/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="zone_journal",
-        kwargs={"model": Zone},
-    ),
-    path(
-        "zones/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="zone_changelog",
-        kwargs={"model": Zone},
-    ),
+    path("zones/<int:pk>/", include(get_model_urls("netbox_dns", "zone"))),
 ]

netbox_dns/urls/zone_template.py

@@ -1,21 +1,31 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import ZoneTemplate
 from netbox_dns.views import (
-    ZoneTemplateListView,
     ZoneTemplateView,
-    ZoneTemplateDeleteView,
+    ZoneTemplateListView,
     ZoneTemplateEditView,
+    ZoneTemplateDeleteView,
     ZoneTemplateBulkImportView,
     ZoneTemplateBulkEditView,
     ZoneTemplateBulkDeleteView,
 )
 
 zonetemplate_urlpatterns = [
+    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
     path("zonetemplates/", ZoneTemplateListView.as_view(), name="zonetemplate_list"),
     path("zonetemplates/add/", ZoneTemplateEditView.as_view(), name="zonetemplate_add"),
+    path(
+        "zonetemplates/<int:pk>/edit/",
+        ZoneTemplateEditView.as_view(),
+        name="zonetemplate_edit",
+    ),
+    path(
+        "zonetemplates/<int:pk>/delete/",
+        ZoneTemplateDeleteView.as_view(),
+        name="zonetemplate_delete",
+    ),
     path(
         "zonetemplates/import/",
         ZoneTemplateBulkImportView.as_view(),
@@ -31,27 +41,7 @@ zonetemplate_urlpatterns = [
         ZoneTemplateBulkDeleteView.as_view(),
         name="zonetemplate_bulk_delete",
     ),
-    path("zonetemplates/<int:pk>/", ZoneTemplateView.as_view(), name="zonetemplate"),
-    path(
-        "zonetemplates/<int:pk>/delete/",
-        ZoneTemplateDeleteView.as_view(),
-        name="zonetemplate_delete",
-    ),
-    path(
-        "zonetemplates/<int:pk>/edit/",
-        ZoneTemplateEditView.as_view(),
-        name="zonetemplate_edit",
-    ),
-    path(
-        "zonetemplates/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="zonetemplate_journal",
-        kwargs={"model": ZoneTemplate},
-    ),
     path(
-        "zonetemplates/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="zonetemplate_changelog",
-        kwargs={"model": ZoneTemplate},
+        "zonetemplates/<int:pk>/", include(get_model_urls("netbox_dns", "zonetemplate"))
     ),
 ]

netbox_dns/utilities/ipam_dnssync.py

@@ -10,9 +10,6 @@ from django.db.models import Q
 from netbox.context import current_request
 from ipam.models import IPAddress, Prefix
 
-from netbox_dns.models import zone as _zone
-from netbox_dns.models import record as _record
-from netbox_dns.models import view as _view
 from netbox_dns.choices import RecordStatusChoices
 
 
@@ -26,6 +23,7 @@ __all__ = (
     "get_ip_addresses_by_view",
     "get_ip_addresses_by_zone",
     "check_record_permission",
+    "get_query_from_filter",
 )
 
 
@@ -74,6 +72,8 @@ def _match_data(ip_address, record):
 
 
 def get_zones(ip_address, view=None, old_zone=None):
+    from netbox_dns.models import Zone
+
     if view is None:
         views = _get_assigned_views(ip_address)
         if not views:
@@ -88,10 +88,10 @@ def get_zones(ip_address, view=None, old_zone=None):
     fqdn = dns_name.from_text(ip_address.dns_name)
     zone_name_candidates = [
         fqdn.split(i)[1].to_text().rstrip(".")
-        for i in range(min_labels + 1, len(fqdn.labels))
+        for i in range(min_labels + 1, len(fqdn.labels) + 1)
     ]
 
-    zones = _zone.Zone.objects.filter(
+    zones = Zone.objects.filter(
         view__in=views,
         name__in=zone_name_candidates,
         active=True,
@@ -114,28 +114,28 @@ def get_zones(ip_address, view=None, old_zone=None):
 
 
 def check_dns_records(ip_address, zone=None, view=None):
+    from netbox_dns.models import Zone, Record
+
     if ip_address.dns_name == "":
         return
 
     if zone is None:
         zones = get_zones(ip_address, view=view)
 
-        if ip_address.pk is not None:
+        if not ip_address._state.adding:
             for record in ip_address.netbox_dns_records.filter(zone__in=zones):
                 if not _match_data(ip_address, record):
-                    record.update_from_ip_address(ip_address)
+                    updated = record.update_from_ip_address(ip_address)
 
-                    if record is not None:
+                    if updated:
                         record.clean()
 
-            zones = _zone.Zone.objects.filter(
-                pk__in=[zone.pk for zone in zones]
-            ).exclude(
+            zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
                 pk__in=set(ip_address.netbox_dns_records.values_list("zone", flat=True))
             )
 
         for zone in zones:
-            record = _record.Record.create_from_ip_address(
+            record = Record.create_from_ip_address(
                 ip_address,
                 zone,
             )
@@ -143,7 +143,7 @@ def check_dns_records(ip_address, zone=None, view=None):
             if record is not None:
                 record.clean()
 
-    if ip_address.pk is None:
+    if ip_address._state.adding:
         return
 
     try:
@@ -152,21 +152,28 @@ def check_dns_records(ip_address, zone=None, view=None):
         return
 
     for record in ip_address.netbox_dns_records.filter(zone=zone):
-        record.update_from_ip_address(ip_address, new_zone)
+        updated = record.update_from_ip_address(ip_address, new_zone)
 
-        if record is not None:
+        if updated:
             record.clean(new_zone=new_zone)
 
 
-def update_dns_records(ip_address):
+def update_dns_records(ip_address, view=None):
+    from netbox_dns.models import Zone, Record
+
     if ip_address.dns_name == "":
         delete_dns_records(ip_address)
         return
 
-    zones = get_zones(ip_address)
+    zones = get_zones(ip_address, view=view)
 
-    if ip_address.pk is not None:
-        for record in ip_address.netbox_dns_records.all():
+    if not ip_address._state.adding:
+        if view is None:
+            address_records = ip_address.netbox_dns_records.all()
+        else:
+            address_records = ip_address.netbox_dns_records.filter(zone__view=view)
+
+        for record in address_records:
             if record.zone not in zones or ip_address.custom_field_data.get(
                 "ipaddress_dns_disabled"
             ):
@@ -175,19 +182,21 @@ def update_dns_records(ip_address):
 
             record.update_fqdn()
             if not _match_data(ip_address, record):
-                record.update_from_ip_address(ip_address)
+                updated, deleted = record.update_from_ip_address(ip_address)
 
-                if record is not None:
+                if deleted:
+                    record.delete()
+                elif updated:
                     record.save()
 
-        zones = _zone.Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
+        zones = Zone.objects.filter(pk__in=[zone.pk for zone in zones]).exclude(
             pk__in=set(
                 ip_address.netbox_dns_records.all().values_list("zone", flat=True)
             )
         )
 
     for zone in zones:
-        record = _record.Record.create_from_ip_address(
+        record = Record.create_from_ip_address(
             ip_address,
             zone,
         )
@@ -196,19 +205,27 @@ def update_dns_records(ip_address):
             record.save()
 
 
-def delete_dns_records(ip_address):
-    for record in ip_address.netbox_dns_records.all():
+def delete_dns_records(ip_address, view=None):
+
+    if view is None:
+        address_records = ip_address.netbox_dns_records.all()
+    else:
+        address_records = ip_address.netbox_dns_records.filter(zone__view=view)
+
+    for record in address_records:
         record.delete()
 
 
 def get_views_by_prefix(prefix):
+    from netbox_dns.models import View
+
     if (views := prefix.netbox_dns_views.all()).exists():
         return views
 
     if (parent := prefix.get_parents().filter(netbox_dns_views__isnull=False)).exists():
         return parent.last().netbox_dns_views.all()
 
-    return _view.View.objects.none()
+    return View.objects.none()
 
 
 def get_ip_addresses_by_prefix(prefix, check_view=True):
@@ -293,3 +310,18 @@ def check_record_permission(add=True, change=True, delete=True):
             if check
         )
     )
+
+
+def get_query_from_filter(ip_address_filter):
+    query = Q()
+
+    if not isinstance(ip_address_filter, list):
+        ip_address_filter = [ip_address_filter]
+
+    for condition in ip_address_filter:
+        if condition:
+            query |= Q(**condition)
+        else:
+            return Q()
+
+    return query

netbox_dns/views/__init__.py

@@ -2,7 +2,7 @@ from .view import *
 from .zone import *
 from .nameserver import *
 from .record import *
-from .contact import *
+from .registration_contact import *
 from .registrar import *
 from .zone_template import *
 from .record_template import *

netbox_dns/views/nameserver.py

@@ -2,6 +2,7 @@ from dns import name as dns_name
 
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import NameServerFilterSet, ZoneFilterSet
 from netbox_dns.forms import (
@@ -15,15 +16,13 @@ from netbox_dns.tables import NameServerTable, ZoneTable
 
 
 __all__ = (
-    "NameServerListView",
     "NameServerView",
+    "NameServerListView",
     "NameServerEditView",
     "NameServerDeleteView",
     "NameServerBulkEditView",
     "NameServerBulkImportView",
     "NameServerBulkDeleteView",
-    "NameServerZoneListView",
-    "NameServerSOAZoneListView",
 )
 
 
@@ -77,6 +76,11 @@ class NameServerBulkDeleteView(generic.BulkDeleteView):
     table = NameServerTable
 
 
+@register_model_view(NameServer, "contacts")
+class NameServerContactsView(ObjectContactsView):
+    queryset = NameServer.objects.all()
+
+
 @register_model_view(NameServer, "zones")
 class NameServerZoneListView(generic.ObjectChildrenView):
     queryset = NameServer.objects.all().prefetch_related("zones")

netbox_dns/views/record.py

@@ -1,6 +1,8 @@
 from dns import name as dns_name
 
 from netbox.views import generic
+from utilities.views import register_model_view
+from tenancy.views import ObjectContactsView
 
 from netbox_dns.filtersets import RecordFilterSet
 from netbox_dns.forms import (
@@ -16,14 +18,14 @@ from netbox_dns.utilities import value_to_unicode
 
 
 __all__ = (
-    "RecordListView",
-    "ManagedRecordListView",
     "RecordView",
+    "RecordListView",
     "RecordEditView",
     "RecordDeleteView",
     "RecordBulkImportView",
     "RecordBulkEditView",
     "RecordBulkDeleteView",
+    "ManagedRecordListView",
 )
 
 
@@ -37,7 +39,9 @@ class RecordListView(generic.ObjectListView):
 
 
 class ManagedRecordListView(generic.ObjectListView):
-    queryset = Record.objects.prefetch_related("ipam_ip_address", "address_record")
+    queryset = Record.objects.filter(managed=True).prefetch_related(
+        "ipam_ip_address", "address_record"
+    )
     filterset = RecordFilterSet
     filterset_form = RecordFilterForm
     table = ManagedRecordTable
@@ -153,3 +157,8 @@ class RecordBulkEditView(generic.BulkEditView):
 class RecordBulkDeleteView(generic.BulkDeleteView):
     queryset = Record.objects.filter(managed=False)
     table = RecordTable
+
+
+@register_model_view(Record, "contacts")
+class RecordContactsView(ObjectContactsView):
+    queryset = Record.objects.all()

netbox_dns/views/record_template.py

@@ -15,8 +15,8 @@ from netbox_dns.utilities import value_to_unicode
 
 
 __all__ = (
-    "RecordTemplateListView",
     "RecordTemplateView",
+    "RecordTemplateListView",
     "RecordTemplateEditView",
     "RecordTemplateDeleteView",
     "RecordTemplateBulkImportView",

netbox_dns/views/registrar.py

@@ -21,7 +21,6 @@ __all__ = (
     "RegistrarBulkImportView",
     "RegistrarBulkEditView",
     "RegistrarBulkDeleteView",
-    "RegistrarZoneListView",
 )
 
 

netbox_dns/views/registration_contact.py

@@ -0,0 +1,94 @@
+from django.db.models import Q
+
+from netbox.views import generic
+
+from utilities.views import ViewTab, register_model_view
+
+from netbox_dns.models import RegistrationContact, Zone
+from netbox_dns.filtersets import RegistrationContactFilterSet, ZoneFilterSet
+from netbox_dns.forms import (
+    RegistrationContactForm,
+    RegistrationContactFilterForm,
+    RegistrationContactImportForm,
+    RegistrationContactBulkEditForm,
+)
+from netbox_dns.tables import RegistrationContactTable, ZoneTable
+
+
+__all__ = (
+    "RegistrationContactView",
+    "RegistrationContactEditView",
+    "RegistrationContactListView",
+    "RegistrationContactDeleteView",
+    "RegistrationContactBulkImportView",
+    "RegistrationContactBulkEditView",
+    "RegistrationContactBulkDeleteView",
+)
+
+
+class RegistrationContactView(generic.ObjectView):
+    queryset = RegistrationContact.objects.all()
+
+
+class RegistrationContactListView(generic.ObjectListView):
+    queryset = RegistrationContact.objects.all()
+    table = RegistrationContactTable
+    filterset = RegistrationContactFilterSet
+    filterset_form = RegistrationContactFilterForm
+
+
+class RegistrationContactEditView(generic.ObjectEditView):
+    queryset = RegistrationContact.objects.all()
+    form = RegistrationContactForm
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactDeleteView(generic.ObjectDeleteView):
+    queryset = RegistrationContact.objects.all()
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactBulkImportView(generic.BulkImportView):
+    queryset = RegistrationContact.objects.all()
+    model_form = RegistrationContactImportForm
+    table = RegistrationContactTable
+    default_return_url = "plugins:netbox_dns:registrationcontact_list"
+
+
+class RegistrationContactBulkEditView(generic.BulkEditView):
+    queryset = RegistrationContact.objects.all()
+    filterset = RegistrationContactFilterSet
+    table = RegistrationContactTable
+    form = RegistrationContactBulkEditForm
+
+
+class RegistrationContactBulkDeleteView(generic.BulkDeleteView):
+    queryset = RegistrationContact.objects.all()
+    table = RegistrationContactTable
+
+
+@register_model_view(RegistrationContact, "zones")
+class RegistrationContactZoneListView(generic.ObjectChildrenView):
+    queryset = RegistrationContact.objects.all().prefetch_related(
+        "zone_set", "admin_c_zones", "tech_c_zones", "billing_c_zones"
+    )
+    child_model = Zone
+    table = ZoneTable
+    filterset = ZoneFilterSet
+    template_name = "netbox_dns/zone/child.html"
+    hide_if_empty = True
+
+    tab = ViewTab(
+        label="Zones",
+        permission="netbox_dns.view_zone",
+        badge=lambda obj: len(obj.zones),
+        hide_if_empty=True,
+    )
+
+    def get_children(self, request, parent):
+        return Zone.objects.filter(
+            Q(registrant=parent)
+            | Q(admin_c=parent)
+            | Q(tech_c=parent)
+            | Q(billing_c=parent)
+        )

netbox_dns/views/view.py

@@ -1,6 +1,7 @@
 from utilities.views import ViewTab, register_model_view
 
 from netbox.views import generic
+from tenancy.views import ObjectContactsView
 from ipam.models import Prefix
 
 from netbox_dns.models import View, Zone
@@ -24,7 +25,6 @@ __all__ = (
     "ViewBulkImportView",
     "ViewBulkEditView",
     "ViewBulkDeleteView",
-    "ViewZoneListView",
     "ViewPrefixEditView",
 )
 
@@ -104,3 +104,8 @@ class ViewZoneListView(generic.ObjectChildrenView):
 
     def get_children(self, request, parent):
         return parent.zone_set
+
+
+@register_model_view(View, "contacts")
+class ViewContactsView(ObjectContactsView):
+    queryset = View.objects.all()