nautobot 2.3.16__py3-none-any.whl → 2.4.0b1__py3-none-any.whl

nautobot/ipam/urls.py

@@ -8,86 +8,20 @@ from .models import (
     IPAddress,
     Prefix,
     RIR,
-    RouteTarget,
     Service,
     VLAN,
     VLANGroup,
-    VRF,
 )
 
 app_name = "ipam"
 
 router = NautobotUIViewSetRouter()
-router.register("namespaces", views.NamespaceUIViewSet)
 router.register("ip-address-to-interface", views.IPAddressToInterfaceUIViewSet)
+router.register("namespaces", views.NamespaceUIViewSet)
+router.register("route-targets", views.RouteTargetUIViewSet)
+router.register("vrfs", views.VRFUIViewSet)
 
 urlpatterns = [
-    # VRFs
-    path("vrfs/", views.VRFListView.as_view(), name="vrf_list"),
-    path("vrfs/add/", views.VRFEditView.as_view(), name="vrf_add"),
-    path("vrfs/import/", views.VRFBulkImportView.as_view(), name="vrf_import"),  # 3.0 TODO: remove, unused
-    path("vrfs/edit/", views.VRFBulkEditView.as_view(), name="vrf_bulk_edit"),
-    path("vrfs/delete/", views.VRFBulkDeleteView.as_view(), name="vrf_bulk_delete"),
-    path("vrfs/<uuid:pk>/", views.VRFView.as_view(), name="vrf"),
-    path("vrfs/<uuid:pk>/edit/", views.VRFEditView.as_view(), name="vrf_edit"),
-    path("vrfs/<uuid:pk>/delete/", views.VRFDeleteView.as_view(), name="vrf_delete"),
-    path(
-        "vrfs/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="vrf_changelog",
-        kwargs={"model": VRF},
-    ),
-    path(
-        "vrfs/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="vrf_notes",
-        kwargs={"model": VRF},
-    ),
-    # Route targets
-    path("route-targets/", views.RouteTargetListView.as_view(), name="routetarget_list"),
-    path(
-        "route-targets/add/",
-        views.RouteTargetEditView.as_view(),
-        name="routetarget_add",
-    ),
-    path(
-        "route-targets/import/",
-        views.RouteTargetBulkImportView.as_view(),  # 3.0 TODO: remove, unused
-        name="routetarget_import",
-    ),
-    path(
-        "route-targets/edit/",
-        views.RouteTargetBulkEditView.as_view(),
-        name="routetarget_bulk_edit",
-    ),
-    path(
-        "route-targets/delete/",
-        views.RouteTargetBulkDeleteView.as_view(),
-        name="routetarget_bulk_delete",
-    ),
-    path("route-targets/<uuid:pk>/", views.RouteTargetView.as_view(), name="routetarget"),
-    path(
-        "route-targets/<uuid:pk>/edit/",
-        views.RouteTargetEditView.as_view(),
-        name="routetarget_edit",
-    ),
-    path(
-        "route-targets/<uuid:pk>/delete/",
-        views.RouteTargetDeleteView.as_view(),
-        name="routetarget_delete",
-    ),
-    path(
-        "route-targets/<uuid:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="routetarget_changelog",
-        kwargs={"model": RouteTarget},
-    ),
-    path(
-        "route-targets/<uuid:pk>/notes/",
-        ObjectNotesView.as_view(),
-        name="routetarget_notes",
-        kwargs={"model": RouteTarget},
-    ),
     # RIRs
     path("rirs/", views.RIRListView.as_view(), name="rir_list"),
     path("rirs/add/", views.RIREditView.as_view(), name="rir_add"),

nautobot/ipam/utils/__init__.py

@@ -4,7 +4,6 @@ import netaddr
 from nautobot.core.forms.utils import compress_range
 from nautobot.dcim.models import Interface
 from nautobot.extras.models import RelationshipAssociation
-from nautobot.ipam.choices import PrefixTypeChoices
 from nautobot.ipam.models import Prefix, VLAN
 from nautobot.ipam.querysets import IPAddressQuerySet
 from nautobot.virtualization.models import VMInterface
@@ -26,13 +25,6 @@ def add_available_prefixes(parent, prefix_list):
     return prefix_list
 
 
-def get_add_available_prefixes_callback(show_available, parent):
-    """Conditionally provide a callback for add_available_prefixes()."""
-    if show_available:
-        return lambda prefixes: add_available_prefixes(parent.prefix, prefixes)
-    return lambda prefixes: prefixes
-
-
 def add_available_ipaddresses(prefix, ipaddress_list, is_pool=False):
     """
     Annotate ranges of available IP addresses within a given prefix. If is_pool is True, the first and last IP will be
@@ -89,15 +81,6 @@ def add_available_ipaddresses(prefix, ipaddress_list, is_pool=False):
     return output
 
 
-def get_add_available_ipaddresses_callback(show_available, parent):
-    """Conditionally provide a callback for add_available_ipaddresses()."""
-    if show_available:
-        return lambda ip_addresses: add_available_ipaddresses(
-            parent.prefix, ip_addresses, is_pool=(parent.type == PrefixTypeChoices.TYPE_POOL)
-        )
-    return lambda ip_addresses: ip_addresses
-
-
 def add_available_vlans(vlan_group, vlans):
     """
     Create fake records for all gaps between used VLANs
@@ -116,13 +99,6 @@ def add_available_vlans(vlan_group, vlans):
     return vlans
 
 
-def get_add_available_vlans_callback(show_available, vlan_group):
-    """Conditionally provide a callback for add_available_vlans()."""
-    if show_available:
-        return lambda vlans: add_available_vlans(vlan_group=vlan_group, vlans=vlans)
-    return lambda vlans: vlans
-
-
 def handle_relationship_changes_when_merging_ips(merged_ip, merged_attributes, collapsed_ips):
     """
     Update/Delete RelationshipAssociation instances after we collapsed the IPs.

nautobot/ipam/views.py

@@ -2,9 +2,7 @@ import logging
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
-from django.core.exceptions import ObjectDoesNotExist
 from django.db import models, transaction
 from django.db.models import Prefetch, ProtectedError, Q
 from django.forms.models import model_to_dict
@@ -18,14 +16,18 @@ from django_tables2 import RequestConfig
 import netaddr
 
 from nautobot.cloud.tables import CloudNetworkTable
+from nautobot.core.constants import MAX_PAGE_SIZE_DEFAULT
 from nautobot.core.models.querysets import count_related
+from nautobot.core.ui import object_detail
+from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.views import generic, mixins as view_mixins
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import handle_protectederror
+from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.dcim.models import Device, Interface, Location
-from nautobot.extras.models import Role, SavedView, Status, Tag
+from nautobot.extras.models import Role, Status, Tag
 from nautobot.ipam import choices, constants
 from nautobot.ipam.api import serializers
 from nautobot.tenancy.models import Tenant
@@ -45,9 +47,9 @@ from .models import (
     VRF,
 )
 from .utils import (
-    get_add_available_ipaddresses_callback,
-    get_add_available_prefixes_callback,
-    get_add_available_vlans_callback,
+    add_available_ipaddresses,
+    add_available_prefixes,
+    add_available_vlans,
     handle_relationship_changes_when_merging_ips,
     retrieve_interface_or_vminterface_from_request,
 )
@@ -103,12 +105,23 @@ class NamespaceIPAddressesView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Find all IPAddresses belonging to this Namespace
-        ip_addresses = instance.ip_addresses.restrict(request.user, "view").select_related("role", "status", "tenant")
+        ip_addresses = (
+            instance.ip_addresses.restrict(request.user, "view")
+            .select_related("role", "status", "tenant")
+            .annotate(
+                interface_count=count_related(Interface, "ip_addresses"),
+                interface_parent_count=count_related(Device, "interfaces__ip_addresses", distinct=True),
+                vm_interface_count=count_related(VMInterface, "ip_addresses"),
+                vm_interface_parent_count=count_related(VirtualMachine, "interfaces__ip_addresses", distinct=True),
+            )
+        )
 
-        ip_address_table = tables.IPAddressTable(ip_addresses, exclude=["namespace"])
+        ip_address_table = tables.IPAddressTable(ip_addresses)
         if request.user.has_perm("ipam.change_ipaddress") or request.user.has_perm("ipam.delete_ipaddress"):
             ip_address_table.columns.show("pk")
 
+        ip_address_table.exclude = ("namespace",)
+
         paginate = {
             "paginator_class": EnhancedPaginator,
             "per_page": get_paginate_count(request),
@@ -145,10 +158,12 @@ class NamespacePrefixesView(generic.ObjectView):
         # Find all Prefixes belonging to this Namespace
         prefixes = instance.prefixes.restrict(request.user, "view").select_related("status")
 
-        prefix_table = tables.PrefixTable(prefixes, exclude=["namespace"])
+        prefix_table = tables.PrefixTable(prefixes)
         if request.user.has_perm("ipam.change_prefix") or request.user.has_perm("ipam.delete_prefix"):
             prefix_table.columns.show("pk")
 
+        prefix_table.exclude = ("namespace",)
+
         paginate = {
             "paginator_class": EnhancedPaginator,
             "per_page": get_paginate_count(request),
@@ -185,10 +200,12 @@ class NamespaceVRFsView(generic.ObjectView):
         # Find all VRFs belonging to this Namespace
         vrfs = instance.vrfs.restrict(request.user, "view")
 
-        vrf_table = tables.VRFTable(vrfs, exclude=["namespace"])
+        vrf_table = tables.VRFTable(vrfs)
         if request.user.has_perm("ipam.change_vrf") or request.user.has_perm("ipam.delete_vrf"):
             vrf_table.columns.show("pk")
 
+        vrf_table.exclude = ("namespace",)
+
         paginate = {
             "paginator_class": EnhancedPaginator,
             "per_page": get_paginate_count(request),
@@ -222,83 +239,59 @@ class NamespaceVRFsView(generic.ObjectView):
 #
 
 
-class VRFListView(generic.ObjectListView):
-    queryset = VRF.objects.all()
-    filterset = filters.VRFFilterSet
-    filterset_form = forms.VRFFilterForm
-    table = tables.VRFTable
-
-
-class VRFView(generic.ObjectView):
-    queryset = VRF.objects.all()
-
-    def get_extra_context(self, request, instance):
-        context = super().get_extra_context(request, instance)
-
-        prefixes = instance.prefixes.restrict(request.user, "view")
-        prefix_count = prefixes.count()
-        prefix_table = tables.PrefixTable(prefixes.select_related("namespace"), hide_hierarchy_ui=True)
-
-        # devices = instance.devices.restrict(request.user, "view")
-        # device_count = devices.count()
-        # device_table = DeviceTable(devices.all(), orderable=False)
-
-        import_targets_table = tables.RouteTargetTable(
-            instance.import_targets.select_related("tenant"), orderable=False
-        )
-        export_targets_table = tables.RouteTargetTable(
-            instance.export_targets.select_related("tenant"), orderable=False
-        )
-
-        # TODO(jathan): This table might need to live on Device and on VRFs
-        # (possibly replacing `device_table` above.
-        vrfs = instance.device_assignments.restrict(request.user, "view")
-        vrf_table = tables.VRFDeviceAssignmentTable(vrfs, exclude=["vrf"])
-        # context["vrf_table"] = vrf_table
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(prefix_table)
-        RequestConfig(request, paginate).configure(vrf_table)
-        RequestConfig(request, paginate).configure(import_targets_table)
-        RequestConfig(request, paginate).configure(export_targets_table)
-
-        context.update(
-            {
-                "device_table": vrf_table,
-                # "device_table": device_table,
-                "prefix_count": prefix_count,
-                "prefix_table": prefix_table,
-                "import_targets_table": import_targets_table,
-                "export_targets_table": export_targets_table,
-            }
-        )
-
-        return context
-
-
-class VRFEditView(generic.ObjectEditView):
-    queryset = VRF.objects.all()
-    model_form = forms.VRFForm
-    template_name = "ipam/vrf_edit.html"
-
-
-class VRFDeleteView(generic.ObjectDeleteView):
+class VRFUIViewSet(NautobotUIViewSet):
     queryset = VRF.objects.all()
-
-
-class VRFBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = VRF.objects.all()
-    table = tables.VRFTable
-
-
-class VRFBulkEditView(generic.BulkEditView):
-    queryset = VRF.objects.select_related("tenant")
-    filterset = filters.VRFFilterSet
-    table = tables.VRFTable
-    form = forms.VRFBulkEditForm
+    filterset_class = filters.VRFFilterSet
+    filterset_form_class = forms.VRFFilterForm
+    table_class = tables.VRFTable
+    form_class = forms.VRFForm
+    bulk_update_form_class = forms.VRFBulkEditForm
+    serializer_class = serializers.VRFSerializer
+
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+                table_class=tables.RouteTargetTable,
+                table_filter="importing_vrfs",
+                table_title="Import Route Targets",
+                add_button_route=None,
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=200,
+                table_class=tables.RouteTargetTable,
+                table_filter="exporting_vrfs",
+                table_title="Export Route Targets",
+                add_button_route=None,
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.FULL_WIDTH,
+                weight=100,
+                table_class=tables.PrefixTable,
+                table_filter="vrfs",
+                table_title="Assigned Prefixes",
+                hide_hierarchy_ui=True,
+                exclude_columns=["namespace"],
+                add_button_route=None,
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.FULL_WIDTH,
+                weight=200,
+                table_class=tables.VRFDeviceAssignmentTable,
+                table_filter="vrf",
+                table_title="Assigned Devices",
+                exclude_columns=["vrf", "namespace", "rd"],
+                add_button_route=None,
+            ),
+        ),
+    )
 
     def extra_post_save_action(self, obj, form):
         if form.cleaned_data.get("add_prefixes", None):
@@ -307,70 +300,43 @@ class VRFBulkEditView(generic.BulkEditView):
             obj.prefixes.remove(*form.cleaned_data["remove_prefixes"])
 
 
-class VRFBulkDeleteView(generic.BulkDeleteView):
-    queryset = VRF.objects.select_related("tenant")
-    filterset = filters.VRFFilterSet
-    table = tables.VRFTable
-
-
 #
 # Route targets
 #
 
 
-class RouteTargetListView(generic.ObjectListView):
+class RouteTargetUIViewSet(NautobotUIViewSet):
     queryset = RouteTarget.objects.all()
-    filterset = filters.RouteTargetFilterSet
-    filterset_form = forms.RouteTargetFilterForm
-    table = tables.RouteTargetTable
-
-
-class RouteTargetView(generic.ObjectView):
-    queryset = RouteTarget.objects.all()
-
-    def get_extra_context(self, request, instance):
-        importing_vrfs_table = tables.VRFTable(instance.importing_vrfs.select_related("tenant"), orderable=False)
-        exporting_vrfs_table = tables.VRFTable(instance.exporting_vrfs.select_related("tenant"), orderable=False)
-
-        paginate = {
-            "paginator_class": EnhancedPaginator,
-            "per_page": get_paginate_count(request),
-        }
-        RequestConfig(request, paginate).configure(importing_vrfs_table)
-        RequestConfig(request, paginate).configure(exporting_vrfs_table)
-
-        return {
-            "importing_vrfs_table": importing_vrfs_table,
-            "exporting_vrfs_table": exporting_vrfs_table,
-            **super().get_extra_context(request, instance),
-        }
-
-
-class RouteTargetEditView(generic.ObjectEditView):
-    queryset = RouteTarget.objects.all()
-    model_form = forms.RouteTargetForm
-
-
-class RouteTargetDeleteView(generic.ObjectDeleteView):
-    queryset = RouteTarget.objects.all()
-
-
-class RouteTargetBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, unused
-    queryset = RouteTarget.objects.all()
-    table = tables.RouteTargetTable
-
-
-class RouteTargetBulkEditView(generic.BulkEditView):
-    queryset = RouteTarget.objects.select_related("tenant")
-    filterset = filters.RouteTargetFilterSet
-    table = tables.RouteTargetTable
-    form = forms.RouteTargetBulkEditForm
-
-
-class RouteTargetBulkDeleteView(generic.BulkDeleteView):
-    queryset = RouteTarget.objects.select_related("tenant")
-    filterset = filters.RouteTargetFilterSet
-    table = tables.RouteTargetTable
+    filterset_class = filters.RouteTargetFilterSet
+    filterset_form_class = forms.RouteTargetFilterForm
+    table_class = tables.RouteTargetTable
+    form_class = forms.RouteTargetForm
+    bulk_update_form_class = forms.RouteTargetBulkEditForm
+    serializer_class = serializers.RouteTargetSerializer
+
+    object_detail_content = object_detail.ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+                table_class=tables.VRFTable,
+                table_filter="import_targets",
+                table_title="Importing VRFs",
+            ),
+            object_detail.ObjectsTablePanel(
+                section=SectionChoices.RIGHT_HALF,
+                weight=200,
+                table_class=tables.VRFTable,
+                table_filter="export_targets",
+                table_title="Exporting VRFs",
+            ),
+        ),
+    )
 
 
 #
@@ -434,7 +400,6 @@ class PrefixListView(generic.ObjectListView):
     table = tables.PrefixDetailTable
     template_name = "ipam/prefix_list.html"
     queryset = Prefix.objects.all()
-    use_new_ui = True
 
 
 class PrefixView(generic.ObjectView):
@@ -447,12 +412,12 @@ class PrefixView(generic.ObjectView):
         "vlan__vlan_group",
         "namespace",
     ).prefetch_related("locations")
-    use_new_ui = True
 
     def get_extra_context(self, request, instance):
         # Parent prefixes table
         parent_prefixes = instance.ancestors().restrict(request.user, "view")
-        parent_prefix_table = tables.PrefixTable(parent_prefixes, exclude=["namespace"])
+        parent_prefix_table = tables.PrefixTable(parent_prefixes)
+        parent_prefix_table.exclude = ("namespace",)
 
         vrfs = instance.vrf_assignments.restrict(request.user, "view")
         vrf_table = tables.VRFPrefixAssignmentTable(vrfs, orderable=False)
@@ -483,19 +448,19 @@ class PrefixPrefixesView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Child prefixes table
-        child_prefixes = instance.descendants().restrict(request.user, "view")
+        child_prefixes = (
+            instance.descendants()
+            .restrict(request.user, "view")
+            .select_related("parent", "status", "role", "vlan", "namespace")
+            .annotate(location_count=count_related(Location, "prefixes"))
+        )
 
         # Add available prefixes to the table if requested
-        data_transform_callback = get_add_available_prefixes_callback(
-            show_available=request.GET.get("show_available", "true") == "true", parent=instance
-        )
+        if child_prefixes and request.GET.get("show_available", "true") == "true":
+            child_prefixes = add_available_prefixes(instance.prefix, child_prefixes)
 
-        prefix_table = tables.PrefixDetailTable(
-            child_prefixes,
-            hide_hierarchy_ui=True,
-            exclude=["namespace"],
-            data_transform_callback=data_transform_callback,
-        )
+        prefix_table = tables.PrefixDetailTable(child_prefixes, hide_hierarchy_ui=True)
+        prefix_table.exclude = ("namespace",)
         if request.user.has_perm("ipam.change_prefix") or request.user.has_perm("ipam.delete_prefix"):
             prefix_table.columns.show("pk")
 
@@ -530,16 +495,26 @@ class PrefixIPAddressesView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         # Find all IPAddresses belonging to this Prefix
-        ipaddresses = instance.get_all_ips().restrict(request.user, "view")
+        ipaddresses = (
+            instance.get_all_ips()
+            .restrict(request.user, "view")
+            .select_related("role", "status", "tenant")
+            .prefetch_related("primary_ip4_for", "primary_ip6_for")
+            .annotate(
+                interface_count=count_related(Interface, "ip_addresses"),
+                interface_parent_count=count_related(Device, "interfaces__ip_addresses", distinct=True),
+                vm_interface_count=count_related(VMInterface, "ip_addresses"),
+                vm_interface_parent_count=count_related(VirtualMachine, "interfaces__ip_addresses", distinct=True),
+            )
+        )
 
         # Add available IP addresses to the table if requested
-        data_transform_callback = get_add_available_ipaddresses_callback(
-            show_available=request.GET.get("show_available", "true") == "true", parent=instance
-        )
+        if request.GET.get("show_available", "true") == "true":
+            ipaddresses = add_available_ipaddresses(
+                instance.prefix, ipaddresses, instance.type == choices.PrefixTypeChoices.TYPE_POOL
+            )
 
-        ip_table = tables.IPAddressTable(
-            ipaddresses, exclude=["parent__namespace"], data_transform_callback=data_transform_callback
-        )
+        ip_table = tables.IPAddressTable(ipaddresses)
         if request.user.has_perm("ipam.change_ipaddress") or request.user.has_perm("ipam.delete_ipaddress"):
             ip_table.columns.show("pk")
 
@@ -736,41 +711,21 @@ class PrefixBulkDeleteView(generic.BulkDeleteView):
 
 
 class IPAddressListView(generic.ObjectListView):
-    queryset = IPAddress.objects.all()
+    queryset = IPAddress.objects.annotate(
+        interface_count=count_related(Interface, "ip_addresses"),
+        interface_parent_count=count_related(Device, "interfaces__ip_addresses", distinct=True),
+        vm_interface_count=count_related(VMInterface, "ip_addresses"),
+        vm_interface_parent_count=count_related(VirtualMachine, "interfaces__ip_addresses", distinct=True),
+        assigned_count=count_related(Interface, "ip_addresses") + count_related(VMInterface, "ip_addresses"),
+    )
     filterset = filters.IPAddressFilterSet
     filterset_form = forms.IPAddressFilterForm
     table = tables.IPAddressDetailTable
     template_name = "ipam/ipaddress_list.html"
 
-    def alter_queryset(self, request):
-        queryset = super().alter_queryset(request)
-
-        # All of the below is just to determine whether we are displaying the "assigned_count" column, and if so,
-        # perform the relevant queryset annotation. Ref: nautobot/nautobot#6605
-        if request.user is None or isinstance(request.user, AnonymousUser):
-            table_columns = None
-        else:
-            table_columns = request.user.get_config("tables.IPAddressDetailTable.columns")
-        current_saved_view_pk = request.GET.get("saved_view", None)
-        if current_saved_view_pk:
-            try:
-                current_saved_view = SavedView.objects.get(view="ipam:ipaddress_list", pk=current_saved_view_pk)
-                view_table_config = current_saved_view.config.get("table_config", {}).get("IPAddressDetailTable", None)
-                if view_table_config is not None:
-                    table_columns = view_table_config.get("columns", table_columns)
-            except ObjectDoesNotExist:
-                pass
-
-        if table_columns and "assigned_count" in table_columns:
-            queryset = queryset.annotate(
-                assigned_count=count_related(Interface, "ip_addresses") + count_related(VMInterface, "ip_addresses"),
-            )
-        return queryset
-
 
 class IPAddressView(generic.ObjectView):
     queryset = IPAddress.objects.select_related("tenant", "status", "role")
-    use_new_ui = True
 
     def get_extra_context(self, request, instance):
         # Parent prefixes table
@@ -929,7 +884,7 @@ class IPAddressAssignView(view_mixins.GetReturnURLMixin, generic.ObjectView):
                 "per_page": get_paginate_count(request),
             }
             RequestConfig(request, paginate).configure(table)
-            max_page_size = get_settings_or_config("MAX_PAGE_SIZE")
+            max_page_size = get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT)
             if max_page_size and paginate["per_page"] > max_page_size:
                 messages.warning(
                     request,
@@ -1258,18 +1213,17 @@ class VLANGroupView(generic.ObjectView):
     def get_extra_context(self, request, instance):
         vlans = (
             VLAN.objects.restrict(request.user, "view")
+            .annotate(location_count=count_related(Location, "vlans"))
             .filter(vlan_group=instance)
             .prefetch_related(Prefetch("prefixes", queryset=Prefix.objects.restrict(request.user)))
         )
         vlans_count = vlans.count()
+        vlans = add_available_vlans(vlan_group=instance, vlans=vlans)
 
-        data_transform_callback = get_add_available_vlans_callback(show_available=True, vlan_group=instance)
-
-        vlan_table = tables.VLANDetailTable(
-            vlans, exclude=["vlan_group"], data_transform_callback=data_transform_callback
-        )
+        vlan_table = tables.VLANDetailTable(vlans)
         if request.user.has_perm("ipam.change_vlan") or request.user.has_perm("ipam.delete_vlan"):
             vlan_table.columns.show("pk")
+        vlan_table.columns.hide("vlan_group")
 
         paginate = {
             "paginator_class": EnhancedPaginator,
@@ -1344,7 +1298,8 @@ class VLANView(generic.ObjectView):
                 "namespace",
             )
         )
-        prefix_table = tables.PrefixTable(list(prefixes), hide_hierarchy_ui=True, exclude=["vlan"])
+        prefix_table = tables.PrefixTable(list(prefixes), hide_hierarchy_ui=True)
+        prefix_table.exclude = ("vlan",)
 
         paginate = {
             "paginator_class": EnhancedPaginator,