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

nautobot/dcim/migrations/0057_controller_models.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.24 on 2024-03-22 15:36
+# Generated by Django 3.2.24 on 2024-03-08 10:18
 
 import uuid
 
@@ -9,13 +9,16 @@ import django.db.models.deletion
 import nautobot.core.models.fields
 import nautobot.core.models.tree_queries
 import nautobot.extras.models.mixins
+import nautobot.extras.models.models
 import nautobot.extras.models.roles
 import nautobot.extras.models.statuses
+import nautobot.extras.utils
 
 
 class Migration(migrations.Migration):
     dependencies = [
         ("extras", "0106_populate_default_statuses_and_roles_for_contact_associations"),
+        ("contenttypes", "0002_remove_content_type_name"),
         ("tenancy", "0009_update_all_charfields_max_length_to_255"),
         ("dcim", "0056_update_all_charfields_max_length_to_255"),
     ]
@@ -36,24 +39,29 @@ class Migration(migrations.Migration):
                     "_custom_field_data",
                     models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
                 ),
+                (
+                    "local_config_context_data",
+                    models.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True),
+                ),
+                ("local_config_context_data_owner_object_id", models.UUIDField(blank=True, default=None, null=True)),
                 ("name", models.CharField(max_length=255, unique=True)),
                 ("description", models.CharField(blank=True, max_length=255)),
                 (
-                    "controller_device",
+                    "deployed_controller_device",
                     models.ForeignKey(
                         blank=True,
                         null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
+                        on_delete=django.db.models.deletion.SET_NULL,
                         related_name="controllers",
                         to="dcim.device",
                     ),
                 ),
                 (
-                    "controller_device_redundancy_group",
+                    "deployed_controller_group",
                     models.ForeignKey(
                         blank=True,
                         null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
+                        on_delete=django.db.models.deletion.SET_NULL,
                         related_name="controllers",
                         to="dcim.deviceredundancygroup",
                     ),
@@ -63,11 +71,33 @@ class Migration(migrations.Migration):
                     models.ForeignKey(
                         blank=True,
                         null=True,
-                        on_delete=django.db.models.deletion.PROTECT,
+                        on_delete=django.db.models.deletion.SET_NULL,
                         related_name="controllers",
                         to="extras.externalintegration",
                     ),
                 ),
+                (
+                    "local_config_context_data_owner_content_type",
+                    nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                        blank=True,
+                        default=None,
+                        limit_choices_to=nautobot.extras.utils.FeatureQuery("config_context_owners"),
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="controllers",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "local_config_context_schema",
+                    nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="controllers",
+                        to="extras.configcontextschema",
+                    ),
+                ),
                 (
                     "location",
                     models.ForeignKey(
@@ -119,10 +149,11 @@ class Migration(migrations.Migration):
                 models.Model,
                 nautobot.extras.models.mixins.DynamicGroupMixin,
                 nautobot.extras.models.mixins.NotesMixin,
+                nautobot.extras.models.models.ConfigContextSchemaValidationMixin,
             ),
         ),
         migrations.CreateModel(
-            name="ControllerManagedDeviceGroup",
+            name="ControllerDeviceGroup",
             fields=[
                 (
                     "id",
@@ -136,16 +167,43 @@ class Migration(migrations.Migration):
                     "_custom_field_data",
                     models.JSONField(blank=True, default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
                 ),
+                (
+                    "local_config_context_data",
+                    models.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True),
+                ),
+                ("local_config_context_data_owner_object_id", models.UUIDField(blank=True, default=None, null=True)),
                 ("name", models.CharField(max_length=255, unique=True)),
                 ("weight", models.PositiveIntegerField(default=1000)),
                 (
                     "controller",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        related_name="controller_managed_device_groups",
+                        related_name="controller_device_groups",
                         to="dcim.controller",
                     ),
                 ),
+                (
+                    "local_config_context_data_owner_content_type",
+                    nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                        blank=True,
+                        default=None,
+                        limit_choices_to=nautobot.extras.utils.FeatureQuery("config_context_owners"),
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="controller_device_groups",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "local_config_context_schema",
+                    nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="controller_device_groups",
+                        to="extras.configcontextschema",
+                    ),
+                ),
                 (
                     "parent",
                     models.ForeignKey(
@@ -153,7 +211,7 @@ class Migration(migrations.Migration):
                         null=True,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="children",
-                        to="dcim.controllermanageddevicegroup",
+                        to="dcim.controllerdevicegroup",
                     ),
                 ),
                 ("tags", nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag")),
@@ -165,6 +223,7 @@ class Migration(migrations.Migration):
                 models.Model,
                 nautobot.extras.models.mixins.DynamicGroupMixin,
                 nautobot.extras.models.mixins.NotesMixin,
+                nautobot.extras.models.models.ConfigContextSchemaValidationMixin,
             ),
             managers=[
                 ("objects", nautobot.core.models.tree_queries.TreeManager()),
@@ -172,13 +231,13 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name="device",
-            name="controller_managed_device_group",
+            name="controller_device_group",
             field=models.ForeignKey(
                 blank=True,
                 null=True,
                 on_delete=django.db.models.deletion.SET_NULL,
                 related_name="devices",
-                to="dcim.controllermanageddevicegroup",
+                to="dcim.controllerdevicegroup",
             ),
         ),
     ]

nautobot/dcim/models/__init__.py

@@ -27,7 +27,7 @@ from .device_components import (
 )
 from .devices import (
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceFamily,
     DeviceRedundancyGroup,
@@ -53,7 +53,7 @@ __all__ = (
     "ConsoleServerPort",
     "ConsoleServerPortTemplate",
     "Controller",
-    "ControllerManagedDeviceGroup",
+    "ControllerDeviceGroup",
     "Device",
     "DeviceBay",
     "DeviceBayTemplate",

nautobot/dcim/models/devices.py

@@ -43,7 +43,7 @@ from .device_components import (
 
 __all__ = (
     "Controller",
-    "ControllerManagedDeviceGroup",
+    "ControllerDeviceGroup",
     "Device",
     "DeviceRedundancyGroup",
     "DeviceType",
@@ -592,8 +592,8 @@ class Device(PrimaryModel, ConfigContextModel):
         verbose_name="Software Image Files",
         help_text="Override the software image files associated with the software version for this device",
     )
-    controller_managed_device_group = models.ForeignKey(
-        to="dcim.ControllerManagedDeviceGroup",
+    controller_device_group = models.ForeignKey(
+        to="dcim.ControllerDeviceGroup",
         on_delete=models.SET_NULL,
         related_name="devices",
         blank=True,
@@ -1247,7 +1247,7 @@ class SoftwareVersion(PrimaryModel):
     "statuses",
     "webhooks",
 )
-class Controller(PrimaryModel):
+class Controller(PrimaryModel, ConfigContextModel):
     """Represents an entity that manages or controls one or more devices, acting as a central point of control.
 
     A Controller can be deployed to a single device or a group of devices represented by a DeviceRedundancyGroup.
@@ -1278,21 +1278,21 @@ class Controller(PrimaryModel):
     )
     external_integration = models.ForeignKey(
         to="extras.ExternalIntegration",
-        on_delete=models.PROTECT,
+        on_delete=models.SET_NULL,
         related_name="controllers",
         blank=True,
         null=True,
     )
-    controller_device = models.ForeignKey(
+    deployed_controller_device = models.ForeignKey(
         to="dcim.Device",
-        on_delete=models.PROTECT,
+        on_delete=models.SET_NULL,
         related_name="controllers",
         blank=True,
         null=True,
     )
-    controller_device_redundancy_group = models.ForeignKey(
+    deployed_controller_group = models.ForeignKey(
         to="dcim.DeviceRedundancyGroup",
-        on_delete=models.PROTECT,
+        on_delete=models.SET_NULL,
         related_name="controllers",
         blank=True,
         null=True,
@@ -1307,10 +1307,12 @@ class Controller(PrimaryModel):
     def clean(self):
         super().clean()
 
-        if self.controller_device and self.controller_device_redundancy_group:
+        if self.deployed_controller_device and self.deployed_controller_group:
             raise ValidationError(
                 {
-                    "controller_device": ("Cannot assign both a device and a device redundancy group to a controller."),
+                    "deployed_controller_device": (
+                        "Cannot assign both a device and a device redundancy group to a controller."
+                    ),
                 },
             )
 
@@ -1329,7 +1331,7 @@ class Controller(PrimaryModel):
     "graphql",
     "webhooks",
 )
-class ControllerManagedDeviceGroup(TreeModel, PrimaryModel):
+class ControllerDeviceGroup(TreeModel, PrimaryModel, ConfigContextModel):
     """Represents a mapping of controlled devices to a specific controller.
 
     This model allows for the organization of controlled devices into hierarchical groups for structured representation.
@@ -1347,7 +1349,7 @@ class ControllerManagedDeviceGroup(TreeModel, PrimaryModel):
     controller = models.ForeignKey(
         to="dcim.Controller",
         on_delete=models.CASCADE,
-        related_name="controller_managed_device_groups",
+        related_name="controller_device_groups",
         blank=False,
         null=False,
         help_text="Controller that manages the devices in this group",
@@ -1371,7 +1373,7 @@ class ControllerManagedDeviceGroup(TreeModel, PrimaryModel):
         if self.controller == self._original_controller and self.parent == self._original_parent:
             return
 
-        if self.parent and self.controller and self.controller != self.parent.controller:
+        if self.parent and self.controller and self.parent.controller and self.controller != self.parent.controller:
             raise ValidationError(
                 {"controller": "Controller device group must have the same controller as the parent group."}
             )

nautobot/dcim/models/racks.py

@@ -1,3 +1,5 @@
+from collections import OrderedDict
+
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
@@ -273,7 +275,7 @@ class Rack(PrimaryModel):
             contains a height attribute for the device
         """
 
-        elevation = {}
+        elevation = OrderedDict()
         for u in self.units:
             elevation[u] = {
                 "id": u,

nautobot/dcim/navigation.py

@@ -18,33 +18,33 @@ menu_items = (
                 weight=150,
                 items=(
                     NavMenuItem(
-                        link="dcim:location_list",
-                        name="Locations",
+                        link="dcim:locationtype_list",
+                        name="Location Types",
                         weight=100,
                         permissions=[
-                            "dcim.view_location",
+                            "dcim.view_locationtype",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="dcim:location_add",
+                                link="dcim:locationtype_add",
                                 permissions=[
-                                    "dcim.add_location",
+                                    "dcim.add_locationtype",
                                 ],
                             ),
                         ),
                     ),
                     NavMenuItem(
-                        link="dcim:locationtype_list",
-                        name="Location Types",
+                        link="dcim:location_list",
+                        name="Locations",
                         weight=200,
                         permissions=[
-                            "dcim.view_locationtype",
+                            "dcim.view_location",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="dcim:locationtype_add",
+                                link="dcim:location_add",
                                 permissions=[
-                                    "dcim.add_locationtype",
+                                    "dcim.add_location",
                                 ],
                             ),
                         ),
@@ -211,33 +211,33 @@ menu_items = (
                         ),
                     ),
                     NavMenuItem(
-                        link="dcim:devicefamily_list",
-                        name="Device Families",
+                        link="dcim:manufacturer_list",
+                        name="Manufacturers",
                         weight=200,
                         permissions=[
-                            "dcim.view_devicefamily",
+                            "dcim.view_manufacturer",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="dcim:devicefamily_add",
+                                link="dcim:manufacturer_add",
                                 permissions=[
-                                    "dcim.add_devicefamily",
+                                    "dcim.add_manufacturer",
                                 ],
                             ),
                         ),
                     ),
                     NavMenuItem(
-                        link="dcim:manufacturer_list",
-                        name="Manufacturers",
+                        link="dcim:devicefamily_list",
+                        name="Device Families",
                         weight=300,
                         permissions=[
-                            "dcim.view_manufacturer",
+                            "dcim.view_devicefamily",
                         ],
                         buttons=(
                             NavMenuAddButton(
-                                link="dcim:manufacturer_add",
+                                link="dcim:devicefamily_add",
                                 permissions=[
-                                    "dcim.add_manufacturer",
+                                    "dcim.add_devicefamily",
                                 ],
                             ),
                         ),
@@ -319,12 +319,20 @@ menu_items = (
                         ),
                     ),
                     NavMenuItem(
-                        link="dcim:controllermanageddevicegroup_list",
-                        name="Managed Device Groups",
+                        link="dcim:controllerdevicegroup_list",
+                        name="Controller Device Groups",
                         weight=200,
                         permissions=[
-                            "dcim.view_controllermanageddevicegroup",
+                            "dcim.view_controllerdevicegroup",
                         ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="dcim:controllerdevicegroup_add",
+                                permissions=[
+                                    "dcim.add_controllerdevicegroup",
+                                ],
+                            ),
+                        ),
                     ),
                 ),
             ),

nautobot/dcim/signals.py

@@ -11,7 +11,7 @@ from nautobot.core.signals import disable_for_loaddata
 from .models import (
     Cable,
     CablePath,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceRedundancyGroup,
     Interface,
@@ -290,17 +290,17 @@ def prevent_adding_tagged_vlans_with_incorrect_mode_or_site(sender, instance, ac
 
 
 #
-# ControllerManagedDeviceGroup
+# ControllerDeviceGroup
 #
 
 
-@receiver(post_save, sender=ControllerManagedDeviceGroup)
-def handle_controller_managed_device_group_controller_change(instance, raw=False, **_):
-    """Update descendants when the top level `ControllerManagedDeviceGroup.controller` changes."""
+@receiver(post_save, sender=ControllerDeviceGroup)
+def handle_controller_device_group_controller_change(instance, raw=False, **_):
+    """Update descendants when the top level `ControllerDeviceGroup.controller` changes."""
     if instance.parent or instance._original_controller == instance.controller:
         return
 
-    logger = logging.getLogger(__name__ + ".ControllerManagedDeviceGroup")
+    logger = logging.getLogger(__name__ + ".ControllerDeviceGroup")
 
     if raw:
         logger.debug("Skipping controller update for imported controller device group %s", instance)

nautobot/dcim/tables/__init__.py

@@ -8,7 +8,7 @@ from .cables import CableTable
 from .devices import (
     ConsolePortTable,
     ConsoleServerPortTable,
-    ControllerManagedDeviceGroupTable,
+    ControllerDeviceGroupTable,
     ControllerTable,
     DeviceBayTable,
     DeviceConsolePortTable,
@@ -66,7 +66,7 @@ __all__ = (
     "ConsoleServerPortTable",
     "ConsoleServerPortTemplateTable",
     "ControllerTable",
-    "ControllerManagedDeviceGroupTable",
+    "ControllerDeviceGroupTable",
     "DeviceBayTable",
     "DeviceBayTemplateTable",
     "DeviceConsolePortTable",

nautobot/dcim/tables/devices.py

@@ -14,7 +14,7 @@ from nautobot.dcim.models import (
     ConsolePort,
     ConsoleServerPort,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceRedundancyGroup,
@@ -60,7 +60,7 @@ __all__ = (
     "ConsolePortTable",
     "ConsoleServerPortTable",
     "ControllerTable",
-    "ControllerManagedDeviceGroupTable",
+    "ControllerDeviceGroupTable",
     "DeviceBayTable",
     "DeviceConsolePortTable",
     "DeviceConsoleServerPortTable",
@@ -164,7 +164,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
     device_redundancy_group_priority = tables.TemplateColumn(
         template_code="""{% if record.device_redundancy_group %}<span class="badge badge-default">{{ record.device_redundancy_group_priority|default:'None' }}</span>{% else %}—{% endif %}"""
     )
-    controller_managed_device_group = tables.Column(linkify=True)
+    controller_device_group = tables.Column(linkify=True)
     secrets_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:device_list")
 
@@ -193,7 +193,7 @@ class DeviceTable(StatusTableMixin, RoleTableMixin, BaseTable):
             "vc_priority",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_managed_device_group",
+            "controller_device_group",
             "secrets_group",
             "tags",
         )
@@ -1142,8 +1142,8 @@ class ControllerTable(BaseTable):
     role = tables.Column(linkify=True)
     tenant = TenantColumn()
     external_integration = tables.Column(linkify=True)
-    controller_device = tables.Column(linkify=True)
-    controller_device_redundancy_group = tables.Column(linkify=True)
+    deployed_controller_device = tables.Column(linkify=True)
+    deployed_controller_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:controller_list")
     actions = ButtonsColumn(Controller)
 
@@ -1160,8 +1160,8 @@ class ControllerTable(BaseTable):
             "role",
             "tenant",
             "external_integration",
-            "controller_device",
-            "controller_device_redundancy_group",
+            "deployed_controller_device",
+            "deployed_controller_group",
             "tags",
             "actions",
         )
@@ -1173,25 +1173,28 @@ class ControllerTable(BaseTable):
             "platform",
             "role",
             "tenant",
+            "external_integration",
+            "deployed_controller_device",
+            "deployed_controller_group",
             "actions",
         )
 
 
-class ControllerManagedDeviceGroupTable(BaseTable):
+class ControllerDeviceGroupTable(BaseTable):
     """Table for list view."""
 
     pk = ToggleColumn()
     name = tables.TemplateColumn(template_code=TREE_LINK, attrs={"td": {"class": "text-nowrap"}})
     weight = tables.Column()
     controller = tables.Column(linkify=True)
-    tags = TagColumn(url_name="dcim:controllermanageddevicegroup_list")
-    actions = ButtonsColumn(ControllerManagedDeviceGroup)
+    tags = TagColumn(url_name="dcim:controllerdevicegroup_list")
+    actions = ButtonsColumn(ControllerDeviceGroup)
     device_count = tables.TemplateColumn(template_code=LINKED_RECORD_COUNT, verbose_name="Devices")
 
     class Meta(BaseTable.Meta):
         """Meta attributes."""
 
-        model = ControllerManagedDeviceGroup
+        model = ControllerDeviceGroup
         fields = (
             "pk",
             "name",

nautobot/dcim/tables/template_code.py

@@ -91,7 +91,7 @@ LINKED_RECORD_COUNT = """
 
 TREE_LINK = """
 {% load helpers %}
-{% tree_hierarchy_ui_representation record.tree_depth|as_range table.hide_hierarchy_ui %}
+{% tree_hierarchy_ui_representation record.tree_depth|as_range table.order_by %}
 <a href="{{ record.get_absolute_url }}">{{ record.name }}</a>
 """
 

nautobot/dcim/templates/dcim/controller_retrieve.html

@@ -22,6 +22,10 @@
                             <td>Role</td>
                             <td>{{ object.role|hyperlinked_object }}</td>
                         </tr>
+                        <tr>
+                            <td>Description</td>
+                            <td>{{ object.description|placeholder }}</td>
+                        </tr>
                         <tr>
                             <td>Location</td>
                             <td>{{ object.location|hyperlinked_object }}</td>
@@ -31,55 +35,34 @@
                             <td>{{ object.platform|hyperlinked_object }}</td>
                         </tr>
                         <tr>
-                            <td>Tenant</td>
-                            <td>
-                                {% if object.tenant and object.tenant.tenant_group %}
-                                    {{ object.tenant.tenant_group|hyperlinked_object }} /
-                                {% endif %}
-                                {{ object.tenant|hyperlinked_object }}
-                            </td>
+                            <td>Role</td>
+                            <td>{{ object.role|hyperlinked_object }}</td>
                         </tr>
                         <tr>
-                            <td>Description</td>
-                            <td>{{ object.description|placeholder }}</td>
+                            <td>Tenant</td>
+                            <td>{{ object.tenant|hyperlinked_object }}</td>
                         </tr>
-                    </table>
-                </div>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Integration</strong>
-                </div>
-                <div class="table-responsive">
-                    <table class="table table-hover panel-body attr-table">
                         <tr>
                             <td>External Integration</td>
                             <td>{{ object.external_integration|hyperlinked_object }}</td>
                         </tr>
-                        {% if object.controller_device %}
-                            <tr>
-                                <td>Controller Device</td>
-                                <td>{{ object.controller_device|hyperlinked_object }}</td>
-                            </tr>
-                        {% endif %}
-                        {% if object.controller_device_redundancy_group %}
-                            <tr>
-                                <td>Controller Device Redundancy Group</td>
-                                <td>{{ object.controller_device_redundancy_group|hyperlinked_object }}</td>
-                            </tr>
-                        {% endif %}
+                        <tr>
+                            <td>Deployed Controller Device</td>
+                            <td>{{ object.deployed_controller_device|hyperlinked_object }}</td>
+                        </tr>
+                        <tr>
+                            <td>Deployed Controller Group</td>
+                            <td>{{ object.deployed_controller_group|hyperlinked_object }}</td>
+                        </tr>
                     </table>
                 </div>
             </div>
-{% endblock content_right_page %}
+{% endblock content_left_page %}
 
 {% block content_full_width_page %}
         <div class="panel panel-default">
             <div class="panel-heading">
-                <strong>Managed Devices</strong>
+                <strong>Devices</strong>
             </div>
             {% include 'responsive_table.html' with table=devices_table %}
         </div>