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

nautobot/dcim/templates/dcim/controllerdevicegroup_create.html

@@ -0,0 +1,43 @@
+{% extends 'generic/object_create.html' %}
+{% load form_helpers %}
+{% load helpers %}
+{% load static %}
+
+{% block javascript %}
+<script type="text/javascript">
+    const parentInput = $('select#id_parent');
+    const controllerInput = $('select#id_controller');
+
+    const controllerUrl = '{% url 'dcim-api:controllerdevicegroup-list' %}';
+
+    const updateControllerFromParent = (parentUuid) => {
+        $.ajax({
+            url: `${controllerUrl}${parentUuid}/`,
+            method: "GET",
+            success: (data) => {
+                if (data.controller) {
+                    controllerInput.val(data.controller.id);
+                }
+            },
+            error: (error) => console.log("ERROR", error),
+        });
+    };
+
+    const onParentInput = (event) => {
+        const parentUuid = parentInput.val();
+        if (parentUuid) {
+            controllerInput.prop("disabled", true);
+            if (event) {
+                updateControllerFromParent(parentUuid);
+            }
+        } else {
+            controllerInput.prop("disabled", false);
+        }
+    }
+
+    parentInput.on('select2:select', onParentInput);
+    parentInput.on('select2:unselect', onParentInput);
+
+    onParentInput();
+</script>
+{% endblock %}

nautobot/dcim/templates/dcim/device/lldp_neighbors.html

@@ -15,7 +15,6 @@
                     <th>Interface</th>
                     <th>Configured Device</th>
                     <th>Configured Interface</th>
-                    <th>Configured MAC Address</th>
                     <th>LLDP Device</th>
                     <th>LLDP Interface</th>
                 </tr>
@@ -28,21 +27,18 @@
                             <td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
                                 {{ iface.connected_endpoint.device|hyperlinked_object }}
                             </td>
-                            <td class="configured_interface" data-interface-name="{{ iface.connected_endpoint }}">
+                            <td class="configured_interface" data="{{ iface.connected_endpoint }}">
                                 <span title="{{ iface.connected_endpoint.get_type_display }}">{{ iface.connected_endpoint }}</span>
                             </td>
-                            <td class="configured_mac" data-mac-address="{{ iface.connected_endpoint.mac_address }}">
-                                <span>{{ iface.connected_endpoint.mac_address }}</span>
-                            </td>
                         {% elif iface.connected_endpoint.circuit %}
                             {% with circuit=iface.connected_endpoint.circuit %}
-                                <td colspan="3">
+                                <td colspan="2">
                                     <i class="mdi mdi-lightning-bolt" title="Circuit"></i>
                                     <a href="{{ circuit.get_absolute_url }}">{{ circuit.provider }} {{ circuit }}</a>
                                 </td>
                             {% endwith %}
                         {% else %}
-                            <td colspan="3">None</td>
+                            <td colspan="2">None</td>
                         {% endif %}
                         <td class="device"></td>
                         <td class="interface"></td>
@@ -56,71 +52,51 @@
 {% block javascript %}
 {{ block.super }}
 <script type="text/javascript">
-var ready = (callback) => {
-    if (document.readyState != "loading") {
-        callback();
-    } else {
-        document.addEventListener("DOMContentLoaded", callback);
-    }
-};
-
-ready(() => {
-    fetch("{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail")
-    .then((response) => {
-        if (!response.ok) {
-            throw Error(response.statusText);
-        }
-        return response.json();
-    })
-    .then((data) => {
-        const interfaces = data["get_lldp_neighbors_detail"];
-        for (var iface of Object.keys(interfaces)) {
-            const neighbor = interfaces[iface][0];
-            const row = document.querySelector('*[data-interface-name="'+ iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
-            // var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
+$(document).ready(function() {
+    $.ajax({
+        url: "{% url 'dcim-api:device-napalm' pk=object.pk %}?method=get_lldp_neighbors_detail",
+        dataType: 'json',
+        success: function(json) {
+            $.each(json['get_lldp_neighbors_detail'], function(iface, neighbors) {
+                var neighbor = neighbors[0];
+                var row = $('*[data-interface-name="' + iface.split(".")[0].replace(/([\/:])/g, "\\$1") + '"]');
 
-            // Glean configured hostnames/interfaces from the DOM
-            const configured_device = row.querySelector('td.configured_device').getAttribute('data');
-            const configured_chassis = row.querySelector('td.configured_device').getAttribute('data-chassis');
-            const configured_interface = row.querySelector('td.configured_interface').getAttribute('data-interface-name').toLowerCase();
-            const configured_mac_address = row.querySelector('td.configured_mac').getAttribute('data-mac-address').toLowerCase();
-            let configured_interface_short = null;
-            if (configured_interface) {
-                // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
-                configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
-            }
+                // Glean configured hostnames/interfaces from the DOM
+                var configured_device = row.children('td.configured_device').attr('data');
+                var configured_chassis = row.children('td.configured_device').attr('data-chassis');
+                var configured_interface = row.children('td.configured_interface').attr('data');
+                var configured_interface_short = null;
+                if (configured_interface) {
+                    // Match long-form IOS names against short ones (e.g. Gi0/1 == GigabitEthernet0/1).
+                    configured_interface_short = configured_interface.replace(/^([A-Z][a-z])[^0-9]*([0-9\/]+)$/, "$1$2");
+                }
 
-            // Clean up hostnames/interfaces learned via LLDP
-            const neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
-            const neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
-            const lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
-            const lldp_interface = neighbor_port.split(".")[0].toLowerCase();   // Strip off any trailing subinterface ID
+                // Clean up hostnames/interfaces learned via LLDP
+                var neighbor_host = neighbor['remote_system_name'] || ""; // sanitize hostname if it's null to avoid breaking the split func
+                var neighbor_port = neighbor['remote_port'] || ""; // sanitize port if it's null to avoid breaking the split func
+                var lldp_device = neighbor_host.split(".")[0];  // Strip off any trailing domain name
+                var lldp_interface = neighbor_port.split(".")[0];   // Strip off any trailing subinterface ID
 
-            // Add LLDP neighbors to table
-            row.querySelector('td.device').textContent = lldp_device;
-            row.querySelector('td.interface').textContent = lldp_interface;
+                // Add LLDP neighbors to table
+                row.children('td.device').html(lldp_device);
+                row.children('td.interface').html(lldp_interface);
 
-            // Apply colors to rows
-            if (!configured_device && lldp_device) {
-                row.classList.add('info');
-            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
-                row.classList.add('success');
-            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
-                row.classList.add('success');
-            } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_mac_address == lldp_interface) {
-                row.classList.add('success');
-            } else {
-                row.classList.add('danger');
-            }
-        }
-    })
-    .catch((error) => {
-        if (error.responseText) {
-            alert(error.responseText);
-        } else {
-            throw error;
+                // Apply colors to rows
+                if (!configured_device && lldp_device) {
+                    row.addClass('info');
+                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface == lldp_interface) {
+                    row.addClass('success');
+                } else if ((configured_device == lldp_device || configured_chassis == lldp_device) && configured_interface_short == lldp_interface) {
+                    row.addClass('success');
+                } else {
+                    row.addClass('danger');
+                }
+            });
+        },
+        error: function(xhr) {
+            alert(xhr.responseText);
         }
     });
 });
 </script>
-{% endblock %}
+{% endblock %}

nautobot/dcim/templates/dcim/device.html

@@ -206,19 +206,11 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>Controller Managed Device Group</td>
+                                        <td>Controller Device Group</td>
                                         <td>
-                                            {{ object.controller_managed_device_group|hyperlinked_object }}
+                                            {{ object.controller_device_group|hyperlinked_object }}
                                         </td>
                                     </tr>
-                                    {% if object.controller_managed_device_group %}
-                                        <tr>
-                                            <td>Managed by Controller</td>
-                                            <td>
-                                                {{ object.controller_managed_device_group.controller|hyperlinked_object }}
-                                            </td>
-                                        </tr>
-                                    {% endif %}
                                     {% if object.cluster %}
                                         <tr>
                                             <td>Cluster</td>

nautobot/dcim/templates/dcim/device_edit.html

@@ -90,7 +90,7 @@
             {% render_field form.secrets_group %}
             {% render_field form.device_redundancy_group %}
             {% render_field form.device_redundancy_group_priority %}
-            {% render_field form.controller_managed_device_group %}
+            {% render_field form.controller_device_group %}
         </div>
     </div>
     <div class="panel panel-default">

nautobot/dcim/tests/test_api.py

@@ -26,7 +26,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -771,7 +771,6 @@ class ManufacturerTest(APIViewTestCases.APIViewTestCase):
         # FIXME: 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()
@@ -1167,7 +1166,6 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
 
     @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]
 
@@ -2170,10 +2168,7 @@ class ConnectedDeviceTest(APITestCase):
     def test_get_connected_device(self):
         url = reverse("dcim-api:connected-device-list")
         response = self.client.get(url + "?peer_device=TestDevice2&peer_interface=eth0", **self.header)
-        self.assertHttpStatus(response, status.HTTP_404_NOT_FOUND)
 
-        self.add_permissions("dcim.view_interface")
-        response = self.client.get(url + "?peer_device=TestDevice2&peer_interface=eth0", **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data["name"], self.device1.name)
 
@@ -2818,8 +2813,8 @@ class ControllerTestCase(APIViewTestCases.APIViewTestCase):
         }
 
 
-class ControllerManagedDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
-    model = ControllerManagedDeviceGroup
+class ControllerDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
+    model = ControllerDeviceGroup
 
     @classmethod
     def setUpTestData(cls):
@@ -2827,17 +2822,17 @@ class ControllerManagedDeviceGroupTestCase(APIViewTestCases.APIViewTestCase):
 
         cls.create_data = [
             {
-                "name": "ControllerManagedDeviceGroup 1",
+                "name": "ControllerDeviceGroup 1",
                 "controller": controllers[0].pk,
                 "weight": 100,
             },
             {
-                "name": "ControllerManagedDeviceGroup 2",
+                "name": "ControllerDeviceGroup 2",
                 "controller": controllers[1].pk,
                 "weight": 150,
             },
             {
-                "name": "ControllerManagedDeviceGroup 3",
+                "name": "ControllerDeviceGroup 3",
                 "controller": controllers[2].pk,
                 "weight": 200,
             },

nautobot/dcim/tests/test_filters.py

@@ -26,8 +26,8 @@ from nautobot.dcim.filters import (
     ConsolePortTemplateFilterSet,
     ConsoleServerPortFilterSet,
     ConsoleServerPortTemplateFilterSet,
+    ControllerDeviceGroupFilterSet,
     ControllerFilterSet,
-    ControllerManagedDeviceGroupFilterSet,
     DeviceBayFilterSet,
     DeviceBayTemplateFilterSet,
     DeviceFamilyFilterSet,
@@ -68,7 +68,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -112,7 +112,6 @@ User = get_user_model()
 
 
 def common_test_data(cls):
-    Controller.objects.filter(controller_device__isnull=False).delete()
     Device.objects.all().delete()
     tenants = Tenant.objects.filter(tenant_group__isnull=False)
     cls.tenants = tenants
@@ -620,82 +619,6 @@ def common_test_data(cls):
     cls.devices[0].tags.set(Tag.objects.get_for_model(Device))
     cls.devices[1].tags.set(Tag.objects.get_for_model(Device)[:3])
 
-    controller_statuses = iter(Status.objects.get_for_model(Controller))
-    external_integrations = iter(ExternalIntegration.objects.all())
-    device_redundancy_groups = iter(DeviceRedundancyGroup.objects.all())
-
-    cls.controllers = (
-        Controller.objects.create(
-            name="Controller 1",
-            status=next(controller_statuses),
-            description="First",
-            location=loc0,
-            platform=platforms[0],
-            role=cls.device_roles[0],
-            tenant=tenants[0],
-            external_integration=next(external_integrations),
-            controller_device=cls.devices[0],
-        ),
-        Controller.objects.create(
-            name="Controller 2",
-            status=next(controller_statuses),
-            description="Second",
-            location=loc1,
-            platform=platforms[1],
-            role=cls.device_roles[1],
-            tenant=tenants[1],
-            external_integration=next(external_integrations),
-            controller_device=cls.devices[1],
-        ),
-        Controller.objects.create(
-            name="Controller 3",
-            status=next(controller_statuses),
-            description="Third",
-            location=loc2,
-            platform=platforms[2],
-            role=cls.device_roles[2],
-            tenant=tenants[2],
-            external_integration=next(external_integrations),
-            controller_device_redundancy_group=next(device_redundancy_groups),
-        ),
-        Controller.objects.create(
-            name="Controller 4",
-            status=next(controller_statuses),
-            description="Forth",
-            location=loc2,
-            platform=platforms[2],
-            role=cls.device_roles[2],
-            tenant=tenants[2],
-            external_integration=next(external_integrations),
-            controller_device_redundancy_group=next(device_redundancy_groups),
-        ),
-    )
-    cls.controllers[0].tags.set(Tag.objects.get_for_model(Controller))
-    cls.controllers[1].tags.set(Tag.objects.get_for_model(Controller)[:3])
-
-    parent_controller_managed_device_group = ControllerManagedDeviceGroup.objects.create(
-        name="Managed Device Group 11",
-        weight=1000,
-        controller=cls.controllers[0],
-    )
-    cls.controller_managed_device_groups = (
-        parent_controller_managed_device_group,
-        ControllerManagedDeviceGroup.objects.create(
-            name="Managed Device Group 12",
-            weight=2000,
-            controller=cls.controllers[1],
-            parent=parent_controller_managed_device_group,
-        ),
-        ControllerManagedDeviceGroup.objects.create(
-            name="Managed Device Group 13",
-            weight=3000,
-            controller=cls.controllers[2],
-            parent=parent_controller_managed_device_group,
-        ),
-    )
-    parent_controller_managed_device_group.tags.set(Tag.objects.get_for_model(ControllerManagedDeviceGroup))
-    cls.controller_managed_device_groups[1].tags.set(Tag.objects.get_for_model(ControllerManagedDeviceGroup)[:3])
-
 
 class LocationTypeFilterSetTestCase(FilterTestCases.NameOnlyFilterTestCase):
     queryset = LocationType.objects.all()
@@ -1418,8 +1341,8 @@ class DeviceTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         ("device_redundancy_group", "device_redundancy_group__id"),
         ("device_redundancy_group", "device_redundancy_group__name"),
         ("device_redundancy_group_priority",),
-        ("controller_managed_device_group", "controller_managed_device_group__id"),
-        ("controller_managed_device_group", "controller_managed_device_group__name"),
+        ("controller_device_group", "controller_device_group__id"),
+        ("controller_device_group", "controller_device_group__name"),
         ("device_type", "device_type__id"),
         ("device_type", "device_type__model"),
         ("front_ports", "front_ports__id"),
@@ -1492,19 +1415,19 @@ class DeviceTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFilt
         Service.objects.create(device=devices[0], name="ssh", protocol="tcp", ports=[22])
         Service.objects.create(device=devices[1], name="dns", protocol="udp", ports=[53])
 
-        cls.controller_managed_device_groups = list(ControllerManagedDeviceGroup.objects.all()[:2])
+        cls.controller_device_groups = list(ControllerDeviceGroup.objects.all()[:2])
         cls.device_redundancy_groups = list(DeviceRedundancyGroup.objects.all()[:2])
         Device.objects.filter(pk=devices[0].pk).update(
-            controller_managed_device_group=cls.controller_managed_device_groups[0],
+            controller_device_group=cls.controller_device_groups[0],
             device_redundancy_group=cls.device_redundancy_groups[0],
         )
         Device.objects.filter(pk=devices[1].pk).update(
-            controller_managed_device_group=cls.controller_managed_device_groups[0],
+            controller_device_group=cls.controller_device_groups[0],
             device_redundancy_group=cls.device_redundancy_groups[0],
             device_redundancy_group_priority=1,
         )
         Device.objects.filter(pk=devices[2].pk).update(
-            controller_managed_device_group=cls.controller_managed_device_groups[1],
+            controller_device_group=cls.controller_device_groups[1],
             device_redundancy_group=cls.device_redundancy_groups[1],
             device_redundancy_group_priority=100,
         )
@@ -3432,20 +3355,63 @@ class ControllerFilterSetTestCase(FilterTestCases.FilterTestCase):
         ("platform", "platform__name"),
         ("external_integration", "external_integration__id"),
         ("external_integration", "external_integration__name"),
-        ("controller_device", "controller_device__id"),
-        ("controller_device", "controller_device__name"),
-        ("controller_device_redundancy_group", "controller_device_redundancy_group__id"),
-        ("controller_device_redundancy_group", "controller_device_redundancy_group__name"),
+        ("deployed_controller_device", "deployed_controller_device__id"),
+        ("deployed_controller_device", "deployed_controller_device__name"),
+        ("deployed_controller_group", "deployed_controller_group__id"),
+        ("deployed_controller_group", "deployed_controller_group__name"),
     )
 
     @classmethod
     def setUpTestData(cls):
         common_test_data(cls)
 
+        external_integrations = iter(ExternalIntegration.objects.all())
+        locations = iter(Location.objects.filter(location_type__name="Campus"))
+        platforms = iter(Platform.objects.all())
+        roles = iter(Role.objects.get_for_model(Controller))
+        statuses = iter(Status.objects.get_for_model(Controller))
+        tenants = iter(Tenant.objects.all())
+
+        cls.controllers = (
+            Controller.objects.create(
+                name="Controller 1",
+                status=next(statuses),
+                description="First",
+                location=next(locations),
+                platform=next(platforms),
+                role=next(roles),
+                tenant=next(tenants),
+                external_integration=next(external_integrations),
+                deployed_controller_device=cls.devices[0],
+            ),
+            Controller.objects.create(
+                name="Controller 2",
+                status=next(statuses),
+                description="Second",
+                location=next(locations),
+                platform=next(platforms),
+                role=next(roles),
+                tenant=next(tenants),
+                external_integration=next(external_integrations),
+                deployed_controller_device=cls.devices[1],
+            ),
+            Controller.objects.create(
+                name="Controller 3",
+                status=next(statuses),
+                description="Third",
+                location=next(locations),
+                platform=next(platforms),
+                role=next(roles),
+                tenant=next(tenants),
+                external_integration=next(external_integrations),
+                deployed_controller_group=DeviceRedundancyGroup.objects.first(),
+            ),
+        )
+
 
-class ControllerManagedDeviceGroupFilterSetTestCase(FilterTestCases.FilterTestCase):
-    queryset = ControllerManagedDeviceGroup.objects.all()
-    filterset = ControllerManagedDeviceGroupFilterSet
+class ControllerDeviceGroupFilterSetTestCase(FilterTestCases.FilterTestCase):
+    queryset = ControllerDeviceGroup.objects.all()
+    filterset = ControllerDeviceGroupFilterSet
     generic_filter_tests = (
         ("name",),
         ("weight",),
@@ -3458,3 +3424,26 @@ class ControllerManagedDeviceGroupFilterSetTestCase(FilterTestCases.FilterTestCa
     @classmethod
     def setUpTestData(cls):
         common_test_data(cls)
+
+        cls.controllers = Controller.objects.all()[:3]
+
+        group1 = ControllerDeviceGroup.objects.create(
+            name="Controller Device Group 11",
+            weight=1000,
+            controller=cls.controllers[0],
+        )
+        cls.controller_device_groups = (
+            group1,
+            ControllerDeviceGroup.objects.create(
+                name="Controller Device Group 12",
+                weight=2000,
+                controller=cls.controllers[1],
+                parent=group1,
+            ),
+            ControllerDeviceGroup.objects.create(
+                name="Controller Device Group 13",
+                weight=3000,
+                controller=cls.controllers[2],
+                parent=group1,
+            ),
+        )

nautobot/dcim/tests/test_graphql.py

@@ -4,22 +4,12 @@ from django.test import override_settings
 from nautobot.core.graphql import execute_query
 from nautobot.core.testing import create_test_user, TestCase
 from nautobot.dcim.choices import InterfaceTypeChoices
-from nautobot.dcim.models import (
-    Controller,
-    Device,
-    DeviceType,
-    Interface,
-    Location,
-    LocationType,
-    Manufacturer,
-    Platform,
-)
+from nautobot.dcim.models import Device, DeviceType, Interface, Location, LocationType, Manufacturer, Platform
 from nautobot.extras.models import DynamicGroup, Role, Status
 
 
 class GraphQLTestCase(TestCase):
     def setUp(self):
-        Controller.objects.filter(controller_device__isnull=False).delete()
         Device.objects.all().delete()
         self.user = create_test_user("graphql_testuser")
         self.location = Location.objects.filter(location_type=LocationType.objects.get(name="Campus")).first()

nautobot/dcim/tests/test_models.py

@@ -24,7 +24,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -1896,13 +1896,13 @@ class ControllerTestCase(ModelTestCases.BaseModelTestCase):
             status=Status.objects.get_for_model(Controller).first(),
             role=Role.objects.get_for_model(Controller).first(),
             location=Location.objects.first(),
-            controller_device=Device.objects.first(),
-            controller_device_redundancy_group=DeviceRedundancyGroup.objects.first(),
+            deployed_controller_device=Device.objects.first(),
+            deployed_controller_group=DeviceRedundancyGroup.objects.first(),
         )
         with self.assertRaises(ValidationError) as error:
             controller.validated_save()
         self.assertEqual(
-            error.exception.message_dict["controller_device"][0],
+            error.exception.message_dict["deployed_controller_device"][0],
             "Cannot assign both a device and a device redundancy group to a controller.",
         )
 
@@ -1924,19 +1924,19 @@ class ControllerTestCase(ModelTestCases.BaseModelTestCase):
         )
 
 
-class ControllerManagedDeviceGroupTestCase(ModelTestCases.BaseModelTestCase):
-    model = ControllerManagedDeviceGroup
+class ControllerDeviceGroupTestCase(ModelTestCases.BaseModelTestCase):
+    model = ControllerDeviceGroup
 
     def test_controller_matches_parent(self):
         """Ensure a controller device group cannot be linked to a controller that does not match its parent."""
         controllers = iter(Controller.objects.all())
-        parent_group = ControllerManagedDeviceGroup(
+        parent_group = ControllerDeviceGroup(
             name="Parent Group testing Controller match",
             controller=next(controllers),
         )
         parent_group.validated_save()
 
-        child_group = ControllerManagedDeviceGroup(
+        child_group = ControllerDeviceGroup(
             name="Child Group testing Controller match",
             controller=next(controllers),
             parent=parent_group,
@@ -1955,37 +1955,37 @@ class ControllerManagedDeviceGroupTestCase(ModelTestCases.BaseModelTestCase):
         controller1, controller2 = Controller.objects.all()[:2]
         self.assertNotEqual(controller1, controller2, "Controllers should be different")
 
-        parent_group = ControllerManagedDeviceGroup.objects.create(
+        parent_group = ControllerDeviceGroup.objects.create(
             name="Parent Group testing Controller match",
             controller=controller1,
         )
-        child_group1 = ControllerManagedDeviceGroup.objects.create(
+        child_group1 = ControllerDeviceGroup.objects.create(
             name="Child Group 1 testing Controller match",
             controller=controller1,
             parent=parent_group,
         )
-        child_group2 = ControllerManagedDeviceGroup.objects.create(
+        child_group2 = ControllerDeviceGroup.objects.create(
             name="Child Group 2 testing Controller match",
             controller=controller1,
             parent=child_group1,
         )
 
-        parent_group = ControllerManagedDeviceGroup.objects.get(pk=parent_group.pk)
+        parent_group = ControllerDeviceGroup.objects.get(pk=parent_group.pk)
         parent_group.controller = controller2
         parent_group.save()
 
         self.assertEqual(
-            ControllerManagedDeviceGroup.objects.get(pk=parent_group.pk).controller,
+            ControllerDeviceGroup.objects.get(pk=parent_group.pk).controller,
             controller2,
             "Parent group controller should have been updated",
         )
         self.assertEqual(
-            ControllerManagedDeviceGroup.objects.get(pk=child_group1.pk).controller,
+            ControllerDeviceGroup.objects.get(pk=child_group1.pk).controller,
             controller2,
             "Child group 1 controller should have been updated",
         )
         self.assertEqual(
-            ControllerManagedDeviceGroup.objects.get(pk=child_group2.pk).controller,
+            ControllerDeviceGroup.objects.get(pk=child_group2.pk).controller,
             controller2,
             "Child group 2 controller should have been updated",
         )