nautobot 2.4.1__py3-none-any.whl → 2.4.3__py3-none-any.whl

nautobot/tenancy/urls.py

@@ -1,83 +1,11 @@
-from django.urls import path
-
-from nautobot.extras.views import ObjectChangeLogView, ObjectNotesView
+from nautobot.core.views.routers import NautobotUIViewSetRouter
 
 from . import views
-from .models import Tenant, TenantGroup
 
 app_name = "tenancy"
-urlpatterns = [
-    # Tenant groups
-    path("tenant-groups/", views.TenantGroupListView.as_view(), name="tenantgroup_list"),
-    path(
-        "tenant-groups/add/",
-        views.TenantGroupEditView.as_view(),
-        name="tenantgroup_add",
-    ),
-    path(
-        "tenant-groups/import/",
-        views.TenantGroupBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="tenantgroup_import",
-    ),
-    path(
-        "tenant-groups/delete/",
-        views.TenantGroupBulkDeleteView.as_view(),
-        name="tenantgroup_bulk_delete",
-    ),
-    path(
-        "tenant-groups/<uuid:pk>/",
-        views.TenantGroupView.as_view(),
-        name="tenantgroup",
-    ),
-    path(
-        "tenant-groups/<uuid:pk>/edit/",
-        views.TenantGroupEditView.as_view(),
-        name="tenantgroup_edit",
-    ),
-    path(
-        "tenant-groups/<uuid:pk>/delete/",
-        views.TenantGroupDeleteView.as_view(),
-        name="tenantgroup_delete",
-    ),
-    path(
-        "tenant-groups/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="tenantgroup_changelog",
-        kwargs={"model": TenantGroup},
-    ),
-    path(
-        "tenant-groups/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="tenantgroup_notes",
-        kwargs={"model": TenantGroup},
-    ),
-    # Tenants
-    path("tenants/", views.TenantListView.as_view(), name="tenant_list"),
-    path("tenants/add/", views.TenantEditView.as_view(), name="tenant_add"),
-    path("tenants/import/", views.TenantBulkImportView.as_view(), name="tenant_import"),  # 3.0 TODO: remove, unused
-    path("tenants/edit/", views.TenantBulkEditView.as_view(), name="tenant_bulk_edit"),
-    path(
-        "tenants/delete/",
-        views.TenantBulkDeleteView.as_view(),
-        name="tenant_bulk_delete",
-    ),
-    path("tenants/<uuid:pk>/", views.TenantView.as_view(), name="tenant"),
-    path("tenants/<uuid:pk>/edit/", views.TenantEditView.as_view(), name="tenant_edit"),
-    path(
-        "tenants/<uuid:pk>/delete/",
-        views.TenantDeleteView.as_view(),
-        name="tenant_delete",
-    ),
-    path(
-        "tenants/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="tenant_changelog",
-        kwargs={"model": Tenant},
-    ),
-    path(
-        "tenants/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="tenant_notes",
-        kwargs={"model": Tenant},
-    ),
-]
+router = NautobotUIViewSetRouter()
+router.register("tenant-groups", views.TenantGroupUIViewSet)
+router.register("tenants", views.TenantUIViewSet)
+
+urlpatterns = []
+urlpatterns += router.urls

nautobot/tenancy/views.py

@@ -2,12 +2,13 @@ from django_tables2 import RequestConfig
 
 from nautobot.circuits.models import Circuit
 from nautobot.core.ui.choices import SectionChoices
-from nautobot.core.ui.object_detail import ObjectDetailContent, ObjectFieldsPanel, StatsPanel
-from nautobot.core.views import generic
+from nautobot.core.ui.object_detail import ObjectDetailContent, ObjectFieldsPanel, ObjectsTablePanel, StatsPanel
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
+from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.dcim.models import Controller, ControllerManagedDeviceGroup, Device, Location, Rack, RackReservation
 from nautobot.extras.models import DynamicGroup
 from nautobot.ipam.models import IPAddress, Prefix, VLAN, VRF
+from nautobot.tenancy.api import serializers
 from nautobot.virtualization.models import Cluster, VirtualMachine
 
 from . import filters, forms, tables
@@ -18,52 +19,51 @@ from .models import Tenant, TenantGroup
 #
 
 
-class TenantGroupListView(generic.ObjectListView):
-    queryset = TenantGroup.objects.all()
-    filterset = filters.TenantGroupFilterSet
-    filterset_form = forms.TenantGroupFilterForm
-    table = tables.TenantGroupTable
-
-
-class TenantGroupView(generic.ObjectView):
+class TenantGroupUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.TenantGroupBulkEditForm
+    filterset_class = filters.TenantGroupFilterSet
+    filterset_form_class = forms.TenantGroupFilterForm
+    form_class = forms.TenantGroupForm
     queryset = TenantGroup.objects.all()
+    serializer_class = serializers.TenantGroupSerializer
+    table_class = tables.TenantGroupTable
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            ObjectsTablePanel(
+                weight=100,
+                section=SectionChoices.RIGHT_HALF,
+                context_table_key="tenant_table",
+                exclude_columns=["tenant_group"],
+            ),
+        )
+    )
 
     def get_extra_context(self, request, instance):
         # Tenants
-        tenants = Tenant.objects.restrict(request.user, "view").filter(
-            tenant_group__in=instance.descendants(include_self=True)
-        )
-
-        tenant_table = tables.TenantTable(tenants)
-        tenant_table.columns.hide("tenant_group")
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(tenant_table)
-
-        return {"tenant_table": tenant_table, **super().get_extra_context(request, instance)}
-
-
-class TenantGroupEditView(generic.ObjectEditView):
-    queryset = TenantGroup.objects.all()
-    model_form = forms.TenantGroupForm
-
-
-class TenantGroupDeleteView(generic.ObjectDeleteView):
-    queryset = TenantGroup.objects.all()
-
-
-class TenantGroupBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = TenantGroup.objects.all()
-    table = tables.TenantGroupTable
-
-
-class TenantGroupBulkDeleteView(generic.BulkDeleteView):
-    queryset = TenantGroup.objects.all()
-    table = tables.TenantGroupTable
-    filterset = filters.TenantGroupFilterSet
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            # ObjectsTablePanel usually handles the generation of this table, this is an exception here
+            # Because we are filtering on its tenant_group as well as the tenant group's descendants
+            # i.e. `instance.descendants(include_self=True)`
+            tenants = Tenant.objects.restrict(request.user, "view").filter(
+                tenant_group__in=instance.descendants(include_self=True)
+            )
+
+            tenant_table = tables.TenantTable(tenants)
+            tenant_table.columns.hide("tenant_group")
+
+            paginate = {
+                "paginator_class": EnhancedPaginator,
+                "per_page": get_paginate_count(request),
+            }
+            RequestConfig(request, paginate).configure(tenant_table)
+            context["tenant_table"] = tenant_table
+        return context
 
 
 #
@@ -71,15 +71,14 @@ class TenantGroupBulkDeleteView(generic.BulkDeleteView):
 #
 
 
-class TenantListView(generic.ObjectListView):
+class TenantUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = forms.TenantBulkEditForm
+    filterset_class = filters.TenantFilterSet
+    filterset_form_class = forms.TenantFilterForm
+    form_class = forms.TenantForm
     queryset = Tenant.objects.all()
-    filterset = filters.TenantFilterSet
-    filterset_form = forms.TenantFilterForm
-    table = tables.TenantTable
-
-
-class TenantView(generic.ObjectView):
-    queryset = Tenant.objects.select_related("tenant_group")
+    serializer_class = serializers.TenantSerializer
+    table_class = tables.TenantTable
     object_detail_content = ObjectDetailContent(
         panels=(
             ObjectFieldsPanel(
@@ -112,31 +111,3 @@ class TenantView(generic.ObjectView):
             ),
         )
     )
-
-
-class TenantEditView(generic.ObjectEditView):
-    queryset = Tenant.objects.all()
-    model_form = forms.TenantForm
-    template_name = "tenancy/tenant_edit.html"
-
-
-class TenantDeleteView(generic.ObjectDeleteView):
-    queryset = Tenant.objects.all()
-
-
-class TenantBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = Tenant.objects.all()
-    table = tables.TenantTable
-
-
-class TenantBulkEditView(generic.BulkEditView):
-    queryset = Tenant.objects.select_related("tenant_group")
-    filterset = filters.TenantFilterSet
-    table = tables.TenantTable
-    form = forms.TenantBulkEditForm
-
-
-class TenantBulkDeleteView(generic.BulkDeleteView):
-    queryset = Tenant.objects.select_related("tenant_group")
-    filterset = filters.TenantFilterSet
-    table = tables.TenantTable

nautobot/virtualization/templates/virtualization/cluster.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/virtualization/templates/virtualization/clustergroup.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/virtualization/templates/virtualization/clustertype.html

@@ -1 +1 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}

nautobot/virtualization/templates/virtualization/virtualmachine.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 

nautobot/virtualization/templates/virtualization/vminterface.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/wireless/api/serializers.py

@@ -15,10 +15,15 @@ class SupportedDataRateSerializer(TaggedModelSerializerMixin, NautobotModelSeria
 
 
 class RadioProfileSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
-    channel_width = serializers.ListField(child=ChoiceField(choices=RadioProfileChannelWidthChoices), allow_empty=True)
+    channel_width = serializers.ListField(
+        child=ChoiceField(choices=RadioProfileChannelWidthChoices),
+        allow_empty=True,
+        required=False,
+    )
     allowed_channel_list = serializers.ListField(
         child=serializers.IntegerField(required=False),
         allow_empty=True,
+        required=False,
     )
 
     class Meta:

nautobot/wireless/api/views.py

@@ -1,4 +1,4 @@
-from nautobot.extras.api.views import NautobotModelViewSet
+from nautobot.extras.api.views import ModelViewSet, NautobotModelViewSet
 from nautobot.wireless import filters, models
 
 from . import serializers
@@ -22,13 +22,13 @@ class WirelessNetworkViewSet(NautobotModelViewSet):
     filterset_class = filters.WirelessNetworkFilterSet
 
 
-class ControllerManagedDeviceGroupWirelessNetworkAssignmentViewSet(NautobotModelViewSet):
+class ControllerManagedDeviceGroupWirelessNetworkAssignmentViewSet(ModelViewSet):
     queryset = models.ControllerManagedDeviceGroupWirelessNetworkAssignment.objects.all()
     serializer_class = serializers.ControllerManagedDeviceGroupWirelessNetworkAssignmentSerializer
     filterset_class = filters.ControllerManagedDeviceGroupWirelessNetworkAssignmentFilterSet
 
 
-class ControllerManagedDeviceGroupRadioProfileAssignmentViewSet(NautobotModelViewSet):
+class ControllerManagedDeviceGroupRadioProfileAssignmentViewSet(ModelViewSet):
     queryset = models.ControllerManagedDeviceGroupRadioProfileAssignment.objects.all()
     serializer_class = serializers.ControllerManagedDeviceGroupRadioProfileAssignmentSerializer
     filterset_class = filters.ControllerManagedDeviceGroupRadioProfileAssignmentFilterSet

nautobot/wireless/tests/test_api.py

@@ -107,6 +107,11 @@ class RadioProfileTest(APIViewTestCases.APIViewTestCase):
                 "tx_power_min": 20,
                 "allowed_channel_list": [],
             },
+            {
+                "name": "Radio Profile 7",
+                "frequency": "6GHz",
+                "regulatory_domain": "US",
+            },
         ]
         cls.bulk_update_data = {
             "frequency": "5GHz",

{nautobot-2.4.1.dist-info → nautobot-2.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 2.4.1
+Version: 2.4.3
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0
@@ -22,8 +22,8 @@ Provides-Extra: mysql
 Provides-Extra: napalm
 Provides-Extra: remote-storage
 Provides-Extra: sso
-Requires-Dist: Django (>=4.2.18,<4.3.0)
-Requires-Dist: GitPython (>=3.1.43,<3.2.0)
+Requires-Dist: Django (>=4.2.19,<4.3.0)
+Requires-Dist: GitPython (>=3.1.44,<3.2.0)
 Requires-Dist: Jinja2 (>=3.1.5,<3.2.0)
 Requires-Dist: Markdown (>=3.6,<3.7)
 Requires-Dist: Pillow (>=11.0.0,<11.1.0)
@@ -33,7 +33,7 @@ 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)
 Requires-Dist: django-celery-results (>=2.5.1,<2.6.0)
-Requires-Dist: django-constance (>=3.1.0,<3.2.0)
+Requires-Dist: django-constance (>=4.3.0,<4.4.0)
 Requires-Dist: django-cors-headers (>=4.4.0,<4.5.0)
 Requires-Dist: django-db-file-storage (>=0.5.6.1,<0.6.0.0)
 Requires-Dist: django-extensions (>=3.2.3,<3.3.0)
@@ -42,10 +42,10 @@ Requires-Dist: django-health-check (>=3.18.3,<3.19.0)
 Requires-Dist: django-jinja (>=2.11.0,<2.12.0)
 Requires-Dist: django-prometheus (>=2.3.1,<2.4.0)
 Requires-Dist: django-redis (>=5.4.0,<5.5.0)
-Requires-Dist: django-silk (>=5.3.0,<5.4.0)
+Requires-Dist: django-silk (>=5.3.2,<5.4.0)
 Requires-Dist: django-storages (==1.14.3) ; extra == "all" or extra == "remote-storage"
-Requires-Dist: django-structlog[celery] (>=9.0.0,<10.0.0)
-Requires-Dist: django-tables2 (>=2.7.4,<2.8.0)
+Requires-Dist: django-structlog[celery] (>=9.0.1,<10.0.0)
+Requires-Dist: django-tables2 (>=2.7.5,<2.8.0)
 Requires-Dist: django-taggit (>=6.1.0,<6.2.0)
 Requires-Dist: django-timezone-field (>=7.0,<7.1)
 Requires-Dist: django-tree-queries (>=0.19.0,<0.20.0)
@@ -57,8 +57,8 @@ 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 (>=31.0.0,<32.0.0)
-Requires-Dist: mysqlclient (>=2.2.6,<2.3.0) ; extra == "all" or extra == "mysql"
+Requires-Dist: kubernetes (>=32.0.0,<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)
@@ -68,8 +68,8 @@ Requires-Dist: prometheus-client (>=0.20.0,<0.21.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<2.10.0)
 Requires-Dist: python-slugify (>=8.0.3,<8.1.0)
 Requires-Dist: pyuwsgi (>=2.0.26,<2.1.0)
-Requires-Dist: social-auth-app-django (>=5.4.2,<5.5.0)
-Requires-Dist: social-auth-core[saml] (>=4.5.3,<4.6.0) ; extra == "all" or extra == "sso"
+Requires-Dist: social-auth-app-django (>=5.4.3,<5.5.0)
+Requires-Dist: social-auth-core[saml] (>=4.5.6,<4.6.0) ; extra == "all" or extra == "sso"
 Requires-Dist: svgwrite (>=1.4.2,<1.5.0)
 Project-URL: Documentation, https://docs.nautobot.com
 Project-URL: Repository, https://github.com/nautobot/nautobot
@@ -92,7 +92,7 @@ Nautobot is a Network Source of Truth and Network Automation Platform built as a
 
 The complete documentation for Nautobot can be found at [Read the Docs](https://docs.nautobot.com/).
 
-Questions? Comments? Start by perusing our [GitHub discussions](https://github.com/nautobot/nautobot/discussions) for the topic you have in mind, or join the **#nautobot** channel on [Network to Code's Slack community](https://slack.networktocode.com/)!
+Questions? Comments? Start by perusing our [GitHub discussions](https://github.com/nautobot/nautobot/discussions) for the topic you have in mind, or join the `#nautobot` channel on [Network to Code's Slack community](https://slack.networktocode.com/)!
 
 ## Build Status