nautobot 2.4.5__py3-none-any.whl → 2.4.6__py3-none-any.whl

nautobot/virtualization/tests/test_views.py

@@ -18,7 +18,7 @@ from nautobot.virtualization.models import (
 )
 
 
-class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = ClusterGroup
 
     @classmethod
@@ -30,8 +30,12 @@ class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "description": "A new cluster group",
         }
 
+        cls.bulk_edit_data = {
+            "description": "New description",
+        }
+
 
-class ClusterTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class ClusterTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = ClusterType
 
     @classmethod
@@ -48,6 +52,10 @@ class ClusterTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "description": "A new cluster type",
         }
 
+        cls.bulk_edit_data = {
+            "description": "New description",
+        }
+
 
 class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Cluster

nautobot/virtualization/urls.py

@@ -1,105 +1,20 @@
 from django.urls import path
 
+from nautobot.core.views.routers import NautobotUIViewSetRouter
 from nautobot.extras.views import ObjectChangeLogView, ObjectDynamicGroupsView, ObjectNotesView
 from nautobot.ipam.views import ServiceEditView
 
 from . import views
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
+from .models import Cluster, VirtualMachine, VMInterface
 
 app_name = "virtualization"
+
+router = NautobotUIViewSetRouter()
+router.register("cluster-groups", views.ClusterGroupUIViewSet)
+router.register("cluster-types", views.ClusterTypeUIViewSet)
+
+
 urlpatterns = [
-    # Cluster types
-    path("cluster-types/", views.ClusterTypeListView.as_view(), name="clustertype_list"),
-    path(
-        "cluster-types/add/",
-        views.ClusterTypeEditView.as_view(),
-        name="clustertype_add",
-    ),
-    path(
-        "cluster-types/import/",
-        views.ClusterTypeBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="clustertype_import",
-    ),
-    path(
-        "cluster-types/delete/",
-        views.ClusterTypeBulkDeleteView.as_view(),
-        name="clustertype_bulk_delete",
-    ),
-    path(
-        "cluster-types/<uuid:pk>/",
-        views.ClusterTypeView.as_view(),
-        name="clustertype",
-    ),
-    path(
-        "cluster-types/<uuid:pk>/edit/",
-        views.ClusterTypeEditView.as_view(),
-        name="clustertype_edit",
-    ),
-    path(
-        "cluster-types/<uuid:pk>/delete/",
-        views.ClusterTypeDeleteView.as_view(),
-        name="clustertype_delete",
-    ),
-    path(
-        "cluster-types/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="clustertype_changelog",
-        kwargs={"model": ClusterType},
-    ),
-    path(
-        "cluster-types/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="clustertype_notes",
-        kwargs={"model": ClusterType},
-    ),
-    # Cluster groups
-    path(
-        "cluster-groups/",
-        views.ClusterGroupListView.as_view(),
-        name="clustergroup_list",
-    ),
-    path(
-        "cluster-groups/add/",
-        views.ClusterGroupEditView.as_view(),
-        name="clustergroup_add",
-    ),
-    path(
-        "cluster-groups/import/",
-        views.ClusterGroupBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="clustergroup_import",
-    ),
-    path(
-        "cluster-groups/delete/",
-        views.ClusterGroupBulkDeleteView.as_view(),
-        name="clustergroup_bulk_delete",
-    ),
-    path(
-        "cluster-groups/<uuid:pk>/",
-        views.ClusterGroupView.as_view(),
-        name="clustergroup",
-    ),
-    path(
-        "cluster-groups/<uuid:pk>/edit/",
-        views.ClusterGroupEditView.as_view(),
-        name="clustergroup_edit",
-    ),
-    path(
-        "cluster-groups/<uuid:pk>/delete/",
-        views.ClusterGroupDeleteView.as_view(),
-        name="clustergroup_delete",
-    ),
-    path(
-        "cluster-groups/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="clustergroup_changelog",
-        kwargs={"model": ClusterGroup},
-    ),
-    path(
-        "cluster-groups/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="clustergroup_notes",
-        kwargs={"model": ClusterGroup},
-    ),
     # Clusters
     path("clusters/", views.ClusterListView.as_view(), name="cluster_list"),
     path("clusters/add/", views.ClusterEditView.as_view(), name="cluster_add"),
@@ -266,3 +181,5 @@ urlpatterns = [
         name="virtualmachine_bulk_add_vminterface",
     ),
 ]
+
+urlpatterns += router.urls

nautobot/virtualization/views.py

@@ -4,18 +4,18 @@ from django.db.models import Prefetch
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django_tables2 import RequestConfig
 
 from nautobot.core.ui import object_detail
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.utils.requests import normalize_querydict
 from nautobot.core.views import generic
-from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
+from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.dcim.models import Device
 from nautobot.dcim.tables import DeviceTable
 from nautobot.extras.views import ObjectConfigContextView
 from nautobot.ipam.models import IPAddress, Service
 from nautobot.ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable, VRFDeviceAssignmentTable
+from nautobot.virtualization.api import serializers
 
 from . import filters, forms, tables
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -25,15 +25,15 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterf
 #
 
 
-class ClusterTypeListView(generic.ObjectListView):
+class ClusterTypeUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.ClusterTypeBulkEditForm
+    filterset_class = filters.ClusterTypeFilterSet
+    filterset_form_class = forms.ClusterTypeFilterForm
+    form_class = forms.ClusterTypeForm
+    serializer_class = serializers.ClusterTypeSerializer
+    table_class = tables.ClusterTypeTable
     queryset = ClusterType.objects.all()
-    filterset = filters.ClusterTypeFilterSet
-    filterset_form = forms.ClusterTypeFilterForm
-    table = tables.ClusterTypeTable
 
-
-class ClusterTypeView(generic.ObjectView):
-    queryset = ClusterType.objects.all()
     object_detail_content = object_detail.ObjectDetailContent(
         panels=(
             object_detail.ObjectFieldsPanel(
@@ -48,79 +48,40 @@ class ClusterTypeView(generic.ObjectView):
                 table_filter="cluster_type",
                 exclude_columns=["cluster_type"],
             ),
-        ),
+        )
     )
 
 
-class ClusterTypeEditView(generic.ObjectEditView):
-    queryset = ClusterType.objects.all()
-    model_form = forms.ClusterTypeForm
-
-
-class ClusterTypeDeleteView(generic.ObjectDeleteView):
-    queryset = ClusterType.objects.all()
-
-
-class ClusterTypeBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = ClusterType.objects.all()
-    table = tables.ClusterTypeTable
-
-
-class ClusterTypeBulkDeleteView(generic.BulkDeleteView):
-    queryset = ClusterType.objects.all()
-    table = tables.ClusterTypeTable
-    filterset = filters.ClusterTypeFilterSet
-
-
 #
 # Cluster groups
 #
 
 
-class ClusterGroupListView(generic.ObjectListView):
-    queryset = ClusterGroup.objects.all()
-    filterset = filters.ClusterGroupFilterSet
-    filterset_form = forms.ClusterGroupFilterForm
-    table = tables.ClusterGroupTable
-
-
-class ClusterGroupView(generic.ObjectView):
+class ClusterGroupUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.ClusterGroupBulkEditForm
+    filterset_class = filters.ClusterGroupFilterSet
+    filterset_form_class = forms.ClusterGroupFilterForm
+    form_class = forms.ClusterGroupForm
+    serializer_class = serializers.ClusterGroupSerializer
+    table_class = tables.ClusterGroupTable
     queryset = ClusterGroup.objects.all()
 
-    def get_extra_context(self, request, instance):
-        # Clusters
-        clusters = Cluster.objects.restrict(request.user, "view").filter(cluster_group=instance)
-
-        cluster_table = tables.ClusterTable(clusters)
-        cluster_table.columns.hide("cluster_group")
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(cluster_table)
-
-        return {"cluster_table": cluster_table, **super().get_extra_context(request, instance)}
-
-
-class ClusterGroupEditView(generic.ObjectEditView):
-    queryset = ClusterGroup.objects.all()
-    model_form = forms.ClusterGroupForm
-
-
-class ClusterGroupDeleteView(generic.ObjectDeleteView):
-    queryset = ClusterGroup.objects.all()
-
-
-class ClusterGroupBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = ClusterGroup.objects.all()
-    table = tables.ClusterGroupTable
-
-
-class ClusterGroupBulkDeleteView(generic.BulkDeleteView):
-    queryset = ClusterGroup.objects.all()
-    table = tables.ClusterGroupTable
-    filterset = filters.ClusterGroupFilterSet
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                weight=100,
+                section=SectionChoices.LEFT_HALF,
+                fields="__all__",
+            ),
+            object_detail.ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.RIGHT_HALF,
+                table_class=tables.ClusterTable,
+                table_filter="cluster_group",
+                exclude_columns=["cluster_group"],
+            ),
+        )
+    )
 
 
 #

{nautobot-2.4.5.dist-info → nautobot-2.4.6.dist-info}/METADATA

@@ -1,21 +1,21 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 2.4.5
+Version: 2.4.6
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0
 Keywords: Nautobot
 Author: Network to Code
 Author-email: opensource@networktocode.com
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.9.2,<3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.9
 Provides-Extra: all
 Provides-Extra: ldap
 Provides-Extra: mysql
@@ -29,6 +29,7 @@ Requires-Dist: Markdown (>=3.6,<3.7)
 Requires-Dist: Pillow (>=11.0.0,<11.1.0)
 Requires-Dist: PyYAML (>=6.0.2,<6.1.0)
 Requires-Dist: celery (>=5.3.6,<5.4.0)
+Requires-Dist: cryptography (>=44.0.2,<44.1.0)
 Requires-Dist: django-ajax-tables (>=1.1.1,<1.2.0)
 Requires-Dist: django-auth-ldap (>=5.1.0,<5.2.0) ; extra == "all" or extra == "ldap"
 Requires-Dist: django-celery-beat (>=2.6.0,<2.7.0)
@@ -57,12 +58,12 @@ Requires-Dist: graphene-django (>=2.16.0,<2.17.0)
 Requires-Dist: graphene-django-optimizer (>=0.8.0,<0.9.0)
 Requires-Dist: jsonschema (>=4.7.0,<5.0.0)
 Requires-Dist: kombu (>=5.4.2,<5.5.0)
-Requires-Dist: kubernetes (>=32.0.0,<33.0.0)
+Requires-Dist: kubernetes (>=32.0.1,<33.0.0)
 Requires-Dist: mysqlclient (>=2.2.7,<2.3.0) ; extra == "all" or extra == "mysql"
 Requires-Dist: napalm (>=4.1.0,<6.0.0) ; extra == "all" or extra == "napalm"
 Requires-Dist: netaddr (>=1.3.0,<1.4.0)
 Requires-Dist: netutils (>=1.6.0,<2.0.0)
-Requires-Dist: nh3 (>=0.2.20,<0.3.0)
+Requires-Dist: nh3 (>=0.2.21,<0.3.0)
 Requires-Dist: packaging (>=23.1)
 Requires-Dist: prometheus-client (>=0.20.0,<0.21.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<2.10.0)