nautobot 2.2.0__py3-none-any.whl → 2.2.0b1__py3-none-any.whl

nautobot/dcim/tests/test_signals.py

@@ -3,7 +3,6 @@
 from django.test import TestCase
 
 from nautobot.dcim.models import (
-    Controller,
     Device,
     DeviceRedundancyGroup,
     DeviceType,
@@ -104,7 +103,6 @@ class DeviceRedundancyGroupTest(TestCase):
         self.device.device_redundancy_group_priority = 1
         self.device.validated_save()
 
-        Controller.objects.all().delete()
         deviceredundancygroup.delete()
 
         self.device.refresh_from_db()

nautobot/dcim/tests/test_views.py

@@ -40,8 +40,8 @@ from nautobot.dcim.choices import (
 )
 from nautobot.dcim.filters import (
     ConsoleConnectionFilterSet,
+    ControllerDeviceGroupFilterSet,
     ControllerFilterSet,
-    ControllerManagedDeviceGroupFilterSet,
     InterfaceConnectionFilterSet,
     PowerConnectionFilterSet,
     SoftwareImageFileFilterSet,
@@ -55,7 +55,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -136,7 +136,6 @@ def create_test_device(name):
 
 class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = LocationType
-    sort_on_field = "nestable"
 
     @classmethod
     def setUpTestData(cls):
@@ -255,20 +254,15 @@ class LocationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 class RackGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = RackGroup
-    sort_on_field = "name"
 
     @classmethod
     def setUpTestData(cls):
         location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()
 
-        rack_groups = (
-            RackGroup.objects.create(name="Rack Group 1", location=location),
-            RackGroup.objects.create(name="Rack Group 2", location=location),
-            RackGroup.objects.create(name="Rack Group 3", location=location),
-            RackGroup.objects.create(name="Rack Group 8", location=location),
-        )
-        RackGroup.objects.create(name="Rack Group Child 1", location=location, parent=rack_groups[0])
-        RackGroup.objects.create(name="Rack Group Child 2", location=location, parent=rack_groups[0])
+        RackGroup.objects.create(name="Rack Group 1", location=location)
+        RackGroup.objects.create(name="Rack Group 2", location=location)
+        RackGroup.objects.create(name="Rack Group 3", location=location)
+        RackGroup.objects.create(name="Rack Group 8", location=location)
 
         cls.form_data = {
             "name": "Rack Group X",
@@ -573,7 +567,6 @@ class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         # FIXME(jathan): This has to be replaced with# `get_deletable_object` and
         # `get_deletable_object_pks` but this is a workaround just so all of these objects are
         # deletable for now.
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         DeviceType.objects.all().delete()
         Platform.objects.all().delete()
@@ -600,7 +593,6 @@ class DeviceTypeTestCase(
 
     @classmethod
     def setUpTestData(cls):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         manufacturers = Manufacturer.objects.all()[:2]
 
@@ -1286,7 +1278,6 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         locations = Location.objects.filter(location_type=LocationType.objects.get(name="Campus"))[:2]
 
@@ -1454,7 +1445,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "face": DeviceFaceChoices.FACE_FRONT,
             "secrets_group": secrets_groups[1].pk,
             "software_version": software_versions[1].pk,
-            "controller_managed_device_group": ControllerManagedDeviceGroup.objects.first().pk,
+            "controller_device_group": ControllerDeviceGroup.objects.first().pk,
         }
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
@@ -2236,9 +2227,6 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             "software_version": software_versions[2].pk,
         }
 
-    def test_table_with_indentation_is_removed_on_filter_or_sort(self):
-        self.skipTest("InventoryItem table has no implementation of indentation.")
-
 
 # TODO: Change base class to PrimaryObjectViewTestCase
 # Blocked by lack of common creation view for cables (termination A must be initialized)
@@ -3131,7 +3119,7 @@ class ControllerTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         tenant = Tenant.objects.first()
 
         cls.form_data = {
-            "controller_device": device.pk,
+            "deployed_controller_device": device.pk,
             "description": "Controller 1 description",
             "external_integration": external_integration.pk,
             "location": location.pk,
@@ -3152,16 +3140,16 @@ class ControllerTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-class ControllerManagedDeviceGroupTestCase(ViewTestCases.PrimaryObjectViewTestCase):
-    model = ControllerManagedDeviceGroup
-    filterset = ControllerManagedDeviceGroupFilterSet
+class ControllerDeviceGroupTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+    model = ControllerDeviceGroup
+    filterset = ControllerDeviceGroupFilterSet
 
     @classmethod
     def setUpTestData(cls):
         controllers = Controller.objects.all()
 
         cls.form_data = {
-            "name": "Managed Device Group 10",
+            "name": "Controller Device Group 10",
             "controller": controllers[0].pk,
             "weight": 100,
             "devices": [item.pk for item in Device.objects.all()[:2]],

nautobot/dcim/urls.py

@@ -40,7 +40,7 @@ router.register("interface-redundancy-groups-associations", views.InterfaceRedun
 router.register("software-image-files", views.SoftwareImageFileUIViewSet)
 router.register("software-versions", views.SoftwareVersionUIViewSet)
 router.register("controllers", views.ControllerUIViewSet)
-router.register("controller-managed-device-groups", views.ControllerManagedDeviceGroupUIViewSet)
+router.register("controller-device-groups", views.ControllerDeviceGroupUIViewSet)
 
 urlpatterns = [
     # Location types

nautobot/dcim/views.py

@@ -11,7 +11,7 @@ from django.forms import (
     ModelMultipleChoiceField,
     MultipleHiddenInput,
 )
-from django.shortcuts import get_object_or_404, HttpResponse, redirect, render
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.functional import cached_property
 from django.utils.html import format_html
 from django.views.generic import View
@@ -48,7 +48,7 @@ from .models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -1459,7 +1459,7 @@ class DeviceBulkEditView(generic.BulkEditView):
         "device_type__manufacturer",
         "secrets_group",
         "device_redundancy_group",
-        "controller_managed_device_group",
+        "controller_device_group",
     )
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
@@ -2359,7 +2359,7 @@ class CableCreateView(generic.ObjectEditView):
             "rear-port": forms.ConnectCableToRearPortForm,
             "power-feed": forms.ConnectCableToPowerFeedForm,
             "circuit-termination": forms.ConnectCableToCircuitTerminationForm,
-        }.get(kwargs.get("termination_b_type"), None)
+        }[kwargs.get("termination_b_type")]
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -2376,9 +2376,6 @@ class CableCreateView(generic.ObjectEditView):
         return obj
 
     def get(self, request, *args, **kwargs):
-        if self.model_form is None:
-            return HttpResponse(status_code=400)
-
         obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
 
         # Parse initial data manually to avoid setting field values as lists
@@ -3024,13 +3021,12 @@ class ControllerUIViewSet(NautobotUIViewSet):
     queryset = Controller.objects.all()
     serializer_class = serializers.ControllerSerializer
     table_class = tables.ControllerTable
-    template_name = "dcim/controller_create.html"
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)
 
         if self.action == "retrieve" and instance:
-            devices = Device.objects.restrict(request.user).filter(controller_managed_device_group__controller=instance)
+            devices = Device.objects.restrict(request.user).filter(controller_device_group__controller=instance)
             devices_table = tables.DeviceTable(devices)
 
             paginate = {
@@ -3044,19 +3040,19 @@ class ControllerUIViewSet(NautobotUIViewSet):
         return context
 
 
-class ControllerManagedDeviceGroupUIViewSet(NautobotUIViewSet):
-    filterset_class = filters.ControllerManagedDeviceGroupFilterSet
-    filterset_form_class = forms.ControllerManagedDeviceGroupFilterForm
-    form_class = forms.ControllerManagedDeviceGroupForm
-    bulk_update_form_class = forms.ControllerManagedDeviceGroupBulkEditForm
+class ControllerDeviceGroupUIViewSet(NautobotUIViewSet):
+    filterset_class = filters.ControllerDeviceGroupFilterSet
+    filterset_form_class = forms.ControllerDeviceGroupFilterForm
+    form_class = forms.ControllerDeviceGroupForm
+    bulk_update_form_class = forms.ControllerDeviceGroupBulkEditForm
     queryset = (
-        ControllerManagedDeviceGroup.objects.all()
+        ControllerDeviceGroup.objects.all()
         .prefetch_related("devices")
-        .annotate(device_count=count_related(Device, "controller_managed_device_group"))
+        .annotate(device_count=count_related(Device, "controller_device_group"))
     )
-    serializer_class = serializers.ControllerManagedDeviceGroupSerializer
-    table_class = tables.ControllerManagedDeviceGroupTable
-    template_name = "dcim/controllermanageddevicegroup_create.html"
+    serializer_class = serializers.ControllerDeviceGroupSerializer
+    table_class = tables.ControllerDeviceGroupTable
+    template_name = "dcim/controllerdevicegroup_create.html"
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)

nautobot/extras/api/urls.py

@@ -2,7 +2,8 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter(view_name="Extras")
+router = OrderedDefaultRouter()
+router.APIRootView = views.ExtrasRootView
 
 # Computed Fields
 router.register("computed-fields", views.ComputedFieldViewSet)

nautobot/extras/api/views.py

@@ -16,6 +16,7 @@ from rest_framework.exceptions import MethodNotAllowed, PermissionDenied, Valida
 from rest_framework.parsers import JSONParser, MultiPartParser
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 
 from nautobot.core.api.authentication import TokenPermissions
 from nautobot.core.api.utils import get_serializer_for_model
@@ -76,6 +77,15 @@ from nautobot.extras.utils import get_worker_count
 from . import serializers
 
 
+class ExtrasRootView(APIRootView):
+    """
+    Extras API root view
+    """
+
+    def get_view_name(self):
+        return "Extras"
+
+
 class NotesViewSetMixin:
     def restrict_queryset(self, request, *args, **kwargs):
         """

nautobot/extras/filters/__init__.py

@@ -1,11 +1,7 @@
-from difflib import get_close_matches
-
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q
 import django_filters
-from drf_spectacular.utils import extend_schema_field
 
 from nautobot.core.api.exceptions import SerializerNotFound
 from nautobot.core.api.utils import get_serializer_for_model
@@ -451,54 +447,7 @@ class NautobotFilterSet(
 #
 
 
-class ContactTeamFilterSet(NameSearchFilterSet, NautobotFilterSet):
-    """Base filter set for Contacts and Teams."""
-
-    similar_to_location_data = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=Location.objects.all(),
-        label="Similar to location contact data",
-        method="_similar_to_location_data",
-    )
-
-    def generate_query__similar_to_location_data(self, queryset, locations):
-        """Helper method used by _similar_to_location_data() method."""
-        query_params = Q()
-        for location in locations:
-            contact_name = location.contact_name
-            contact_phone = location.contact_phone
-            contact_email = location.contact_email
-            if contact_name:
-                contact_names = list(queryset.order_by().values_list("name", flat=True).distinct())
-                name_matches = get_close_matches(contact_name, contact_names, cutoff=0.8)
-                if name_matches:
-                    query_params |= Q(name__in=name_matches)
-            if contact_phone:
-                contact_phones = list(queryset.order_by().values_list("phone", flat=True).distinct())
-                phone_matches = get_close_matches(contact_phone, contact_phones, cutoff=0.8)
-                if phone_matches:
-                    query_params |= Q(phone__in=phone_matches)
-            if contact_email:
-                contact_emails = list(queryset.order_by().values_list("email", flat=True).distinct())
-                # fuzzy matching for emails doesn't make sense, use case insensitive match here
-                email_matches = [e for e in contact_emails if e.casefold() == contact_email.casefold()]
-                if email_matches:
-                    query_params |= Q(email__in=email_matches)
-
-        return query_params
-
-    @extend_schema_field({"type": "string"})
-    def _similar_to_location_data(self, queryset, name, value):
-        """FilterSet method for getting Contacts or Teams that are similar to the explicit contact fields of a location"""
-        if value:
-            params = self.generate_query__similar_to_location_data(queryset, value)
-            if len(params) > 0:
-                return queryset.filter(params)
-            else:
-                return queryset.none()
-        return queryset
-
-
-class ContactFilterSet(ContactTeamFilterSet):
+class ContactFilterSet(NameSearchFilterSet, NautobotFilterSet):
     class Meta:
         model = Contact
         fields = "__all__"
@@ -1160,7 +1109,7 @@ class TagFilterSet(NautobotFilterSet):
 #
 
 
-class TeamFilterSet(ContactTeamFilterSet):
+class TeamFilterSet(NameSearchFilterSet, NautobotFilterSet):
     class Meta:
         model = Team
         fields = "__all__"

nautobot/extras/forms/contacts.py

@@ -28,13 +28,6 @@ class ContactForm(NautobotModelForm):
             "tags",
         ]
 
-    def __init__(self, instance=None, initial=None, **kwargs):
-        if instance is not None:
-            if initial is None:
-                initial = {}
-            initial.setdefault("teams", instance.teams.all())
-        super().__init__(instance=instance, initial=initial, **kwargs)
-
     def save(self, *args, **kwargs):
         """
         Since `teams` field on Contact Model is the reverse side of an M2M,

nautobot/extras/managers.py

@@ -8,20 +8,6 @@ from nautobot.core.models.querysets import RestrictedQuerySet
 
 
 class JobResultManager(BaseManager.from_queryset(RestrictedQuerySet), TaskResultManager):
-    def get_task(self, task_id):
-        """Get result for task by ``task_id``.
-
-        This overloads `TaskResultManager.get_task` provided by `django-celery-results` to manage custom
-        behaviors for integration with Nautobot.
-        """
-        try:
-            return self.get(id=task_id)
-        except self.model.DoesNotExist:
-            if self._last_id == task_id:
-                self.warn_if_repeatable_read()
-            self._last_id = task_id
-            return self.model(id=task_id)
-
     @transaction_retry(max_retries=2)
     def store_result(
         self,

nautobot/extras/navigation.py

@@ -13,51 +13,9 @@ menu_items = (
         name="Organization",
         weight=100,
         groups=(
-            NavMenuGroup(
-                name="Contacts",
-                weight=400,
-                items=(
-                    NavMenuItem(
-                        link="extras:contact_list",
-                        name="Contacts",
-                        weight=100,
-                        permissions=["extras.view_contact"],
-                        buttons=[NavMenuAddButton(link="extras:contact_add", permissions=["extras.add_contact"])],
-                    ),
-                    NavMenuItem(
-                        link="extras:team_list",
-                        name="Teams",
-                        weight=200,
-                        permissions=["extras.view_team"],
-                        buttons=[NavMenuAddButton(link="extras:team_add", permissions=["extras.add_team"])],
-                    ),
-                ),
-            ),
-            NavMenuGroup(
-                name="Groups",
-                weight=500,
-                items=(
-                    NavMenuItem(
-                        link="extras:dynamicgroup_list",
-                        name="Dynamic Groups",
-                        weight=100,
-                        permissions=[
-                            "extras.view_dynamicgroup",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="extras:dynamicgroup_add",
-                                permissions=[
-                                    "extras.add_dynamicgroup",
-                                ],
-                            ),
-                        ),
-                    ),
-                ),
-            ),
             NavMenuGroup(
                 name="Metadata",  # TODO: is there a better name for this grouping?
-                weight=600,
+                weight=400,
                 items=(
                     NavMenuItem(
                         link="extras:tag_list",
@@ -107,6 +65,42 @@ menu_items = (
                             ),
                         ),
                     ),
+                    NavMenuItem(
+                        link="extras:contact_list",
+                        name="Contacts",
+                        weight=400,
+                        permissions=["extras.view_contact"],
+                        buttons=[NavMenuAddButton(link="extras:contact_add", permissions=["extras.add_contact"])],
+                    ),
+                    NavMenuItem(
+                        link="extras:team_list",
+                        name="Teams",
+                        weight=500,
+                        permissions=["extras.view_team"],
+                        buttons=[NavMenuAddButton(link="extras:team_add", permissions=["extras.add_team"])],
+                    ),
+                ),
+            ),
+            NavMenuGroup(
+                name="Dynamic Groups",
+                weight=500,
+                items=(
+                    NavMenuItem(
+                        link="extras:dynamicgroup_list",
+                        name="Dynamic Groups",
+                        weight=100,
+                        permissions=[
+                            "extras.view_dynamicgroup",
+                        ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="extras:dynamicgroup_add",
+                                permissions=[
+                                    "extras.add_dynamicgroup",
+                                ],
+                            ),
+                        ),
+                    ),
                 ),
             ),
         ),
@@ -282,6 +276,22 @@ menu_items = (
                             ),
                         ),
                     ),
+                    NavMenuItem(
+                        link="extras:relationship_list",
+                        name="Relationships",
+                        weight=200,
+                        permissions=[
+                            "extras.view_relationship",
+                        ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="extras:relationship_add",
+                                permissions=[
+                                    "extras.add_relationship",
+                                ],
+                            ),
+                        ),
+                    ),
                     NavMenuItem(
                         link="extras:note_list",
                         name="Notes",
@@ -379,53 +389,37 @@ menu_items = (
                 ),
             ),
             NavMenuGroup(
-                name="Data Model",
+                name="Miscellaneous",
                 weight=600,
                 items=(
                     NavMenuItem(
-                        link="extras:customfield_list",
-                        name="Custom Fields",
+                        link="extras:computedfield_list",
+                        name="Computed Fields",
                         weight=100,
                         permissions=[
-                            "extras.view_customfield",
+                            "extras.view_computedfield",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="extras:customfield_add",
+                                link="extras:computedfield_add",
                                 permissions=[
-                                    "extras.add_customfield",
+                                    "extras.add_computedfield",
                                 ],
                             ),
                         ),
                     ),
                     NavMenuItem(
-                        link="extras:relationship_list",
-                        name="Relationships",
+                        link="extras:customfield_list",
+                        name="Custom Fields",
                         weight=200,
                         permissions=[
-                            "extras.view_relationship",
-                        ],
-                        buttons=(
-                            NavMenuAddButton(
-                                link="extras:relationship_add",
-                                permissions=[
-                                    "extras.add_relationship",
-                                ],
-                            ),
-                        ),
-                    ),
-                    NavMenuItem(
-                        link="extras:computedfield_list",
-                        name="Computed Fields",
-                        weight=300,
-                        permissions=[
-                            "extras.view_computedfield",
+                            "extras.view_customfield",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="extras:computedfield_add",
+                                link="extras:customfield_add",
                                 permissions=[
-                                    "extras.add_computedfield",
+                                    "extras.add_customfield",
                                 ],
                             ),
                         ),
@@ -433,7 +427,7 @@ menu_items = (
                     NavMenuItem(
                         link="extras:customlink_list",
                         name="Custom Links",
-                        weight=400,
+                        weight=300,
                         permissions=[
                             "extras.view_customlink",
                         ],

nautobot/extras/plugins/views.py

@@ -2,9 +2,11 @@ from collections import OrderedDict
 
 from django.apps import apps
 from django.conf import settings
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import Http404
 from django.shortcuts import render
 from django.urls.exceptions import NoReverseMatch
+from django.views.generic import View
 from django_tables2 import RequestConfig
 from drf_spectacular.utils import extend_schema
 from rest_framework import permissions
@@ -12,14 +14,13 @@ from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
 
-from nautobot.core.api.views import AuthenticatedAPIRootView, NautobotAPIVersionMixin
+from nautobot.core.api.views import NautobotAPIVersionMixin
 from nautobot.core.forms import TableConfigForm
-from nautobot.core.views.generic import GenericView
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.extras.plugins.tables import InstalledAppsTable
 
 
-class InstalledAppsView(GenericView):
+class InstalledAppsView(LoginRequiredMixin, View):
     """
     View for listing all installed Apps.
     """
@@ -65,7 +66,7 @@ class InstalledAppsView(GenericView):
         )
 
 
-class InstalledAppDetailView(GenericView):
+class InstalledAppDetailView(LoginRequiredMixin, View):
     """
     View for showing details of an installed App.
     """
@@ -92,6 +93,7 @@ class InstalledAppsAPIView(NautobotAPIVersionMixin, APIView):
     """
 
     permission_classes = [permissions.IsAdminUser]
+    _ignore_model_permissions = True
 
     def get_view_name(self):
         return "Installed Apps"
@@ -127,9 +129,11 @@ class InstalledAppsAPIView(NautobotAPIVersionMixin, APIView):
         return Response([self._get_app_data(apps.get_app_config(app)) for app in settings.PLUGINS])
 
 
-class AppsAPIRootView(AuthenticatedAPIRootView):
-    name = "Apps"
-    description = "API extension point for installed Nautobot Apps"
+class AppsAPIRootView(NautobotAPIVersionMixin, APIView):
+    _ignore_model_permissions = True
+
+    def get_view_name(self):
+        return "Apps"
 
     @staticmethod
     def _get_app_entry(app_config, request, format_):

nautobot/extras/tests/test_api.py

@@ -18,7 +18,6 @@ from nautobot.core.testing import APITestCase, APIViewTestCases
 from nautobot.core.testing.utils import disable_warnings
 from nautobot.core.utils.lookup import get_route_for_model
 from nautobot.dcim.models import (
-    Controller,
     Device,
     DeviceType,
     Location,
@@ -2852,7 +2851,6 @@ class RelationshipTest(APIViewTestCases.APIViewTestCase, RequiredRelationshipTes
         vlan_groups = VLANGroup.objects.all()[:2]
 
         # Try deleting all devices and then creating 2 VLANs (fails):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         response = send_bulk_data(
             "post",

nautobot/extras/tests/test_dynamicgroups.py

@@ -16,7 +16,6 @@ from nautobot.dcim.choices import PortTypeChoices
 from nautobot.dcim.filters import DeviceFilterSet
 from nautobot.dcim.forms import DeviceFilterForm, DeviceForm
 from nautobot.dcim.models import (
-    Controller,
     Device,
     DeviceType,
     FrontPort,
@@ -49,7 +48,6 @@ from nautobot.tenancy.models import Tenant
 class DynamicGroupTestBase(TestCase):
     @classmethod
     def setUpTestData(cls):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         cls.device_ct = ContentType.objects.get_for_model(Device)
         cls.dynamicgroup_ct = ContentType.objects.get_for_model(DynamicGroup)