Skip to content

refactor(views): Streamline view registrations #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2025
Merged

refactor(views): Streamline view registrations #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 6 additions & 108 deletions netbox_acls/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,13 @@
from django.urls import include, path
from utilities.urls import get_model_urls

from . import views
from . import views # noqa F401

urlpatterns = (
# Access Lists
path("access-lists/", views.AccessListListView.as_view(), name="accesslist_list"),
path(
"access-lists/add/",
views.AccessListEditView.as_view(),
name="accesslist_add",
),
# path('access-lists/edit/', views.AccessListBulkEditView.as_view(), name='accesslist_bulk_edit'),
path(
"access-lists/delete/",
views.AccessListBulkDeleteView.as_view(),
name="accesslist_bulk_delete",
),
path("access-lists/<int:pk>/", views.AccessListView.as_view(), name="accesslist"),
path(
"access-lists/<int:pk>/edit/",
views.AccessListEditView.as_view(),
name="accesslist_edit",
),
path(
"access-lists/<int:pk>/delete/",
views.AccessListDeleteView.as_view(),
name="accesslist_delete",
"access-lists/",
include(get_model_urls("netbox_acls", "accesslist", detail=False)),
),
path(
"access-lists/<int:pk>/",
Expand All @@ -39,38 +20,7 @@
# Access List Interface Assignments
path(
"interface-assignments/",
views.ACLInterfaceAssignmentListView.as_view(),
name="aclinterfaceassignment_list",
),
path(
"interface-assignments/add/",
views.ACLInterfaceAssignmentEditView.as_view(),
name="aclinterfaceassignment_add",
),
# path(
# "interface-assignments/edit/",
# views.ACLInterfaceAssignmentBulkEditView.as_view(),
# name="aclinterfaceassignment_bulk_edit"
# ),
path(
"interface-assignments/delete/",
views.ACLInterfaceAssignmentBulkDeleteView.as_view(),
name="aclinterfaceassignment_bulk_delete",
),
path(
"interface-assignments/<int:pk>/",
views.ACLInterfaceAssignmentView.as_view(),
name="aclinterfaceassignment",
),
path(
"interface-assignments/<int:pk>/edit/",
views.ACLInterfaceAssignmentEditView.as_view(),
name="aclinterfaceassignment_edit",
),
path(
"interface-assignments/<int:pk>/delete/",
views.ACLInterfaceAssignmentDeleteView.as_view(),
name="aclinterfaceassignment_delete",
include(get_model_urls("netbox_acls", "aclinterfaceassignment", detail=False)),
),
path(
"interface-assignments/<int:pk>/",
Expand All @@ -79,33 +29,7 @@
# Standard Access List Rules
path(
"standard-rules/",
views.ACLStandardRuleListView.as_view(),
name="aclstandardrule_list",
),
path(
"standard-rules/add/",
views.ACLStandardRuleEditView.as_view(),
name="aclstandardrule_add",
),
path(
"standard-rules/delete/",
views.ACLStandardRuleBulkDeleteView.as_view(),
name="aclstandardrule_bulk_delete",
),
path(
"standard-rules/<int:pk>/",
views.ACLStandardRuleView.as_view(),
name="aclstandardrule",
),
path(
"standard-rules/<int:pk>/edit/",
views.ACLStandardRuleEditView.as_view(),
name="aclstandardrule_edit",
),
path(
"standard-rules/<int:pk>/delete/",
views.ACLStandardRuleDeleteView.as_view(),
name="aclstandardrule_delete",
include(get_model_urls("netbox_acls", "aclstandardrule", detail=False)),
),
path(
"standard-rules/<int:pk>/",
Expand All @@ -114,33 +38,7 @@
# Extended Access List Rules
path(
"extended-rules/",
views.ACLExtendedRuleListView.as_view(),
name="aclextendedrule_list",
),
path(
"extended-rules/add/",
views.ACLExtendedRuleEditView.as_view(),
name="aclextendedrule_add",
),
path(
"extended-rules/delete/",
views.ACLExtendedRuleBulkDeleteView.as_view(),
name="aclextendedrule_bulk_delete",
),
path(
"extended-rules/<int:pk>/",
views.ACLExtendedRuleView.as_view(),
name="aclextendedrule",
),
path(
"extended-rules/<int:pk>/edit/",
views.ACLExtendedRuleEditView.as_view(),
name="aclextendedrule_edit",
),
path(
"extended-rules/<int:pk>/delete/",
views.ACLExtendedRuleDeleteView.as_view(),
name="aclextendedrule_delete",
include(get_model_urls("netbox_acls", "aclextendedrule", detail=False)),
),
path(
"extended-rules/<int:pk>/",
Expand Down
16 changes: 13 additions & 3 deletions netbox_acls/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def get_extra_context(self, request, instance):
return {}


@register_model_view(models.AccessList, "list", path="", detail=False)
class AccessListListView(generic.ObjectListView):
"""
Defines the list view for the AccessLists django model.
Expand All @@ -84,6 +85,7 @@ class AccessListListView(generic.ObjectListView):
filterset_form = forms.AccessListFilterForm


@register_model_view(models.AccessList, "add", detail=False)
@register_model_view(models.AccessList, "edit")
class AccessListEditView(generic.ObjectEditView):
"""
Expand All @@ -103,6 +105,7 @@ class AccessListDeleteView(generic.ObjectDeleteView):
queryset = models.AccessList.objects.prefetch_related("tags")


@register_model_view(models.AccessList, "bulk_delete", path="delete", detail=False)
class AccessListBulkDeleteView(generic.BulkDeleteView):
queryset = models.AccessList.objects.prefetch_related("tags")
filterset = filtersets.AccessListFilterSet
Expand Down Expand Up @@ -194,6 +197,7 @@ class ACLInterfaceAssignmentView(generic.ObjectView):
)


@register_model_view(models.ACLInterfaceAssignment, "list", path="", detail=False)
class ACLInterfaceAssignmentListView(generic.ObjectListView):
"""
Defines the list view for the ACLInterfaceAssignments django model.
Expand All @@ -208,6 +212,7 @@ class ACLInterfaceAssignmentListView(generic.ObjectListView):
filterset_form = forms.ACLInterfaceAssignmentFilterForm


@register_model_view(models.ACLInterfaceAssignment, "add", detail=False)
@register_model_view(models.ACLInterfaceAssignment, "edit")
class ACLInterfaceAssignmentEditView(generic.ObjectEditView):
"""
Expand Down Expand Up @@ -243,6 +248,7 @@ class ACLInterfaceAssignmentDeleteView(generic.ObjectDeleteView):
)


@register_model_view(models.ACLInterfaceAssignment, "bulk_delete", path="delete", detail=False)
class ACLInterfaceAssignmentBulkDeleteView(generic.BulkDeleteView):
queryset = models.ACLInterfaceAssignment.objects.prefetch_related(
"access_list",
Expand Down Expand Up @@ -288,9 +294,7 @@ def get_children(self, request, parent):


@register_model_view(VMInterface, "acl_interface_assignments")
class VirtualMachineInterfaceACLInterfaceAssignmentView(
ACLInterfaceAssignmentChildView,
):
class VirtualMachineInterfaceACLInterfaceAssignmentView(ACLInterfaceAssignmentChildView):
queryset = VMInterface.objects.prefetch_related("virtual_machine", "tags")
tab = ViewTab(
label="ACL Interface Assignments",
Expand Down Expand Up @@ -324,6 +328,7 @@ class ACLStandardRuleView(generic.ObjectView):
)


@register_model_view(models.ACLStandardRule, "list", path="", detail=False)
class ACLStandardRuleListView(generic.ObjectListView):
"""
Defines the list view for the ACLStandardRule django model.
Expand All @@ -339,6 +344,7 @@ class ACLStandardRuleListView(generic.ObjectListView):
filterset_form = forms.ACLStandardRuleFilterForm


@register_model_view(models.ACLStandardRule, "add", detail=False)
@register_model_view(models.ACLStandardRule, "edit")
class ACLStandardRuleEditView(generic.ObjectEditView):
"""
Expand Down Expand Up @@ -375,6 +381,7 @@ class ACLStandardRuleDeleteView(generic.ObjectDeleteView):
)


@register_model_view(models.ACLStandardRule, "bulk_delete", path="delete", detail=False)
class ACLStandardRuleBulkDeleteView(generic.BulkDeleteView):
queryset = models.ACLStandardRule.objects.prefetch_related(
"access_list",
Expand Down Expand Up @@ -404,6 +411,7 @@ class ACLExtendedRuleView(generic.ObjectView):
)


@register_model_view(models.ACLExtendedRule, "list", path="", detail=False)
class ACLExtendedRuleListView(generic.ObjectListView):
"""
Defines the list view for the ACLExtendedRule django model.
Expand All @@ -420,6 +428,7 @@ class ACLExtendedRuleListView(generic.ObjectListView):
filterset_form = forms.ACLExtendedRuleFilterForm


@register_model_view(models.ACLExtendedRule, "add", detail=False)
@register_model_view(models.ACLExtendedRule, "edit")
class ACLExtendedRuleEditView(generic.ObjectEditView):
"""
Expand Down Expand Up @@ -458,6 +467,7 @@ class ACLExtendedRuleDeleteView(generic.ObjectDeleteView):
)


@register_model_view(models.ACLExtendedRule, "bulk_delete", path="delete", detail=False)
class ACLExtendedRuleBulkDeleteView(generic.BulkDeleteView):
queryset = models.ACLExtendedRule.objects.prefetch_related(
"access_list",
Expand Down