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

nautobot/dcim/api/views.py

@@ -13,7 +13,6 @@ from rest_framework.decorators import action
 from rest_framework.mixins import ListModelMixin
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
-from rest_framework.routers import APIRootView
 from rest_framework.viewsets import GenericViewSet, ViewSet
 
 from nautobot.circuits.models import Circuit
@@ -30,7 +29,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerDeviceGroup,
+    ControllerManagedDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -76,16 +75,6 @@ from nautobot.virtualization.models import VirtualMachine
 from . import serializers
 from .exceptions import MissingFilterException
 
-
-class DCIMRootView(APIRootView):
-    """
-    DCIM API root view
-    """
-
-    def get_view_name(self):
-        return "DCIM"
-
-
 # Mixins
 
 
@@ -391,7 +380,7 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
         "software_version",
         "virtual_chassis__master",
         "device_redundancy_group",
-        "controller_device_group",
+        "controller_managed_device_group",
         "secrets_group",
         "status",
     ).prefetch_related("tags", "primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list", "software_image_files")
@@ -786,7 +775,7 @@ class ConnectedDeviceViewSet(ViewSet):
 
         # Determine local interface from peer interface's connection
         peer_interface = get_object_or_404(
-            Interface.objects.all(),
+            Interface.objects.restrict(request.user, "view"),
             device__name=peer_device_name,
             name=peer_interface_name,
         )
@@ -840,11 +829,11 @@ class ControllerViewSet(NautobotModelViewSet):
     filterset_class = filters.ControllerFilterSet
 
 
-class ControllerDeviceGroupViewSet(NautobotModelViewSet):
-    queryset = ControllerDeviceGroup.objects.select_related(
+class ControllerManagedDeviceGroupViewSet(NautobotModelViewSet):
+    queryset = ControllerManagedDeviceGroup.objects.select_related(
         "controller",
         "parent",
     ).prefetch_related("tags")
 
-    serializer_class = serializers.ControllerDeviceGroupSerializer
-    filterset_class = filters.ControllerDeviceGroupFilterSet
+    serializer_class = serializers.ControllerManagedDeviceGroupSerializer
+    filterset_class = filters.ControllerManagedDeviceGroupFilterSet

nautobot/dcim/apps.py

@@ -5,14 +5,18 @@ class DCIMConfig(NautobotConfig):
     name = "nautobot.dcim"
     verbose_name = "DCIM"
     searchable_models = [
+        "cable",
+        "controller",
+        "device",
+        "devicefamily",
+        "deviceredundancygroup",
+        "devicetype",
         "location",
+        "powerfeed",
         "rack",
         "rackgroup",
-        "devicetype",
-        "device",
+        "softwareversion",
         "virtualchassis",
-        "cable",
-        "powerfeed",
     ]
 
     def ready(self):

nautobot/dcim/elevations.py

@@ -3,6 +3,8 @@ from django.urls import reverse
 from django.utils.http import urlencode
 import svgwrite
 
+from nautobot.core.utils.config import get_settings_or_config
+
 from .choices import DeviceFaceChoices
 from .constants import RACK_ELEVATION_BORDER_WIDTH
 
@@ -233,7 +235,9 @@ class RackElevationSVG:
                 start_y + unit_height / 2 + RACK_ELEVATION_BORDER_WIDTH,
             )
             unit = ru + 1 if self.rack.desc_units else self.rack.u_height - ru
-            drawing.add(drawing.text(str(unit), position_coordinates, class_="unit"))
+            unit_two_digit_format = get_settings_or_config("RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT")
+            unit_display = f"{unit:02d}" if unit_two_digit_format else str(unit)
+            drawing.add(drawing.text(unit_display, position_coordinates, class_="unit"))
 
         for unit in self.merge_elevations(face):
             # Loop through all units in the elevation

nautobot/dcim/factory.py

@@ -26,7 +26,7 @@ from nautobot.dcim.choices import (
 )
 from nautobot.dcim.models import (
     Controller,
-    ControllerDeviceGroup,
+    ControllerManagedDeviceGroup,
     Device,
     DeviceFamily,
     DeviceRedundancyGroup,
@@ -167,7 +167,7 @@ class DeviceFactory(PrimaryModelFactory):
         factory.Faker("pyint", min_value=1, max_value=500),
     )
 
-    controller_device_group = random_instance(ControllerDeviceGroup)
+    controller_managed_device_group = random_instance(ControllerManagedDeviceGroup)
 
     has_comments = NautobotBoolIterator()
     comments = factory.Maybe("has_comments", factory.Faker("bs"))
@@ -694,19 +694,19 @@ class ControllerFactory(PrimaryModelFactory):
     location = random_instance(lambda: Location.objects.get_for_model(Controller), allow_null=False)
     tenant = random_instance(Tenant)
     external_integration = random_instance(ExternalIntegration)
-    deployed_controller_device = factory.Maybe("has_device", random_instance(Device), None)
-    deployed_controller_group = factory.Maybe("has_device", None, random_instance(DeviceRedundancyGroup))
+    controller_device = factory.Maybe("has_device", random_instance(Device), None)
+    controller_device_redundancy_group = factory.Maybe("has_device", None, random_instance(DeviceRedundancyGroup))
 
 
-class ControllerDeviceGroupFactory(PrimaryModelFactory):
+class ControllerManagedDeviceGroupFactory(PrimaryModelFactory):
     class Meta:
-        model = ControllerDeviceGroup
+        model = ControllerManagedDeviceGroup
 
     class Params:
         has_parent = NautobotBoolIterator()
 
     name = UniqueFaker("word")
-    parent = factory.Maybe("has_parent", random_instance(ControllerDeviceGroup), None)
+    parent = factory.Maybe("has_parent", random_instance(ControllerManagedDeviceGroup), None)
     controller = factory.LazyAttribute(
         lambda o: o.parent.controller if o.parent else Controller.objects.order_by("?").first()
     )

nautobot/dcim/filters/__init__.py

@@ -42,7 +42,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerDeviceGroup,
+    ControllerManagedDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -99,7 +99,7 @@ __all__ = (
     "ConsoleServerPortFilterSet",
     "ConsoleServerPortTemplateFilterSet",
     "ControllerFilterSet",
-    "ControllerDeviceGroupFilterSet",
+    "ControllerManagedDeviceGroupFilterSet",
     "DeviceBayFilterSet",
     "DeviceBayTemplateFilterSet",
     "DeviceFilterSet",
@@ -918,11 +918,11 @@ class DeviceFilterSet(
         to_field_name="name",
         label="Device Redundancy Groups (name or ID)",
     )
-    controller_device_group = NaturalKeyOrPKMultipleChoiceFilter(
-        field_name="controller_device_group",
-        queryset=ControllerDeviceGroup.objects.all(),
+    controller_managed_device_group = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="controller_managed_device_group",
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         to_field_name="name",
-        label="Controller Device Groups (name or ID)",
+        label="Controller Managed Device Groups (name or ID)",
     )
     virtual_chassis_member = is_virtual_chassis_member
     has_console_ports = RelatedMembershipBooleanFilter(
@@ -1842,7 +1842,6 @@ class ControllerFilterSet(
     NautobotFilterSet,
     LocatableModelFilterSetMixin,
     TenancyModelFilterSetMixin,
-    LocalContextModelFilterSetMixin,
     StatusModelFilterSetMixin,
     RoleModelFilterSetMixin,
 ):
@@ -1864,15 +1863,15 @@ class ControllerFilterSet(
         to_field_name="name",
         label="External integration (name or ID)",
     )
-    deployed_controller_device = NaturalKeyOrPKMultipleChoiceFilter(
+    controller_device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Deployed controller device (name or ID)",
+        label="Controller device (name or ID)",
     )
-    deployed_controller_group = NaturalKeyOrPKMultipleChoiceFilter(
+    controller_device_redundancy_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceRedundancyGroup.objects.all(),
         to_field_name="name",
-        label="Deployed controller group (name or ID)",
+        label="Controller device redundancy group (name or ID)",
     )
 
     class Meta:
@@ -1880,8 +1879,8 @@ class ControllerFilterSet(
         fields = "__all__"
 
 
-class ControllerDeviceGroupFilterSet(NautobotFilterSet):
-    """Filters for ControllerDeviceGroup model."""
+class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
+    """Filters for ControllerManagedDeviceGroup model."""
 
     q = SearchFilter(
         filter_predicates={
@@ -1894,7 +1893,7 @@ class ControllerDeviceGroupFilterSet(NautobotFilterSet):
         label="Controller (name or ID)",
     )
     parent = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=ControllerDeviceGroup.objects.all(),
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         to_field_name="name",
         label="Parent group (name or ID)",
     )
@@ -1906,7 +1905,7 @@ class ControllerDeviceGroupFilterSet(NautobotFilterSet):
     )
 
     class Meta:
-        model = ControllerDeviceGroup
+        model = ControllerManagedDeviceGroup
         fields = "__all__"
 
     def generate_query__subtree(self, value):
@@ -1914,7 +1913,7 @@ class ControllerDeviceGroupFilterSet(NautobotFilterSet):
         if value:
             params = Q(pk__in=[v.pk for v in value])
             filter_name = "in"
-            for _ in range(ControllerDeviceGroup.objects.max_depth + 1):
+            for _ in range(ControllerManagedDeviceGroup.objects.max_depth + 1):
                 filter_name = f"parent__{filter_name}"
                 params |= Q(**{filter_name: value})
             return params
@@ -1922,6 +1921,6 @@ class ControllerDeviceGroupFilterSet(NautobotFilterSet):
 
     @extend_schema_field({"type": "string"})
     def _subtree(self, queryset, name, value):
-        """FilterSet method for getting Groups that are or are descended from a given ControllerDeviceGroup(s)."""
+        """FilterSet method for getting Groups that are or are descended from a given ControllerManagedDeviceGroup(s)."""
         params = self.generate_query__subtree(value)
         return queryset.filter(params)

nautobot/dcim/forms.py

@@ -95,7 +95,7 @@ from .models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerDeviceGroup,
+    ControllerManagedDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -1548,7 +1548,9 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
         },
     )
     device_redundancy_group = DynamicModelChoiceField(queryset=DeviceRedundancyGroup.objects.all(), required=False)
-    controller_device_group = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
+    controller_managed_device_group = DynamicModelChoiceField(
+        queryset=ControllerManagedDeviceGroup.objects.all(), required=False
+    )
     position = forms.IntegerField(
         required=False,
         help_text="The lowest-numbered unit occupied by the device",
@@ -1618,7 +1620,7 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
             "rack",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_device_group",
+            "controller_managed_device_group",
             "position",
             "face",
             "status",
@@ -1760,7 +1762,9 @@ class DeviceBulkEditForm(
     secrets_group = DynamicModelChoiceField(queryset=SecretsGroup.objects.all(), required=False)
     device_redundancy_group = DynamicModelChoiceField(queryset=DeviceRedundancyGroup.objects.all(), required=False)
     device_redundancy_group_priority = forms.IntegerField(required=False, min_value=1)
-    controller_device_group = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
+    controller_managed_device_group = DynamicModelChoiceField(
+        queryset=ControllerManagedDeviceGroup.objects.all(), required=False
+    )
     software_version = DynamicModelChoiceField(queryset=SoftwareVersion.objects.all(), required=False)
     software_image_files = DynamicModelMultipleChoiceField(queryset=SoftwareImageFile.objects.all(), required=False)
 
@@ -1778,7 +1782,7 @@ class DeviceBulkEditForm(
             "secrets_group",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_device_group",
+            "controller_managed_device_group",
             "software_image_files",
             "software_version",
         ]
@@ -1858,8 +1862,8 @@ class DeviceFilterForm(
         null_option="None",
     )
     device_redundancy_group_priority = NumericArrayField(base_field=forms.IntegerField(min_value=1), required=False)
-    controller_device_group = DynamicModelMultipleChoiceField(
-        queryset=ControllerDeviceGroup.objects.all(),
+    controller_managed_device_group = DynamicModelMultipleChoiceField(
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         to_field_name="name",
         required=False,
         null_option="None",
@@ -4123,9 +4127,30 @@ class SoftwareVersionForm(NautobotModelForm):
         fields = "__all__"
 
 
-class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalContextModelForm):
+class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
     """Controller create/edit form."""
 
+    platform = DynamicModelChoiceField(
+        queryset=Platform.objects.all(),
+        required=False,
+    )
+    tenant = DynamicModelChoiceField(
+        queryset=Tenant.objects.all(),
+        required=False,
+    )
+    external_integration = DynamicModelChoiceField(
+        queryset=ExternalIntegration.objects.all(),
+        required=False,
+    )
+    controller_device = DynamicModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+    )
+    controller_device_redundancy_group = DynamicModelChoiceField(
+        queryset=DeviceRedundancyGroup.objects.all(),
+        required=False,
+    )
+
     class Meta:
         model = Controller
         fields = (
@@ -4137,15 +4162,14 @@ class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, Lo
             "tenant",
             "location",
             "external_integration",
-            "deployed_controller_device",
-            "deployed_controller_group",
+            "controller_device",
+            "controller_device_redundancy_group",
             "tags",
         )
 
 
 class ControllerFilterForm(
     NautobotFilterForm,
-    LocalContextFilterForm,
     LocatableModelFilterFormMixin,
     TenancyFilterForm,
     StatusModelFilterFormMixin,
@@ -4167,15 +4191,15 @@ class ControllerFilterForm(
         required=False,
         label="External integration",
     )
-    deployed_controller_device = DynamicModelMultipleChoiceField(
+    controller_device = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label="Deployed controller device",
+        label="Controller device",
     )
-    deployed_controller_group = DynamicModelMultipleChoiceField(
+    controller_device_redundancy_group = DynamicModelMultipleChoiceField(
         queryset=DeviceRedundancyGroup.objects.all(),
         required=False,
-        label="Deployed controller group",
+        label="Controller device redundancy group",
     )
     tags = TagFilterField(model)
     field_order = (
@@ -4188,8 +4212,8 @@ class ControllerFilterForm(
         "platform",
         "tenant",
         "external_integration",
-        "deployed_controller_device",
-        "deployed_controller_group",
+        "controller_device",
+        "controller_device_redundancy_group",
         "tags",
     )
 
@@ -4200,7 +4224,6 @@ class ControllerBulkEditForm(
     StatusModelBulkEditFormMixin,
     RoleModelBulkEditFormMixin,
     NautobotBulkEditForm,
-    LocalContextModelBulkEditForm,
 ):
     """Controller bulk edit form."""
 
@@ -4220,11 +4243,11 @@ class ControllerBulkEditForm(
         queryset=ExternalIntegration.objects.all(),
         required=False,
     )
-    deployed_controller_device = DynamicModelChoiceField(
+    controller_device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False,
     )
-    deployed_controller_group = DynamicModelChoiceField(
+    controller_device_redundancy_group = DynamicModelChoiceField(
         queryset=DeviceRedundancyGroup.objects.all(),
         required=False,
     )
@@ -4239,24 +4262,24 @@ class ControllerBulkEditForm(
             "platform",
             "tenant",
             "external_integration",
-            "deployed_controller_device",
-            "deployed_controller_group",
+            "controller_device",
+            "controller_device_redundancy_group",
             "tags",
         )
 
 
-class ControllerDeviceGroupForm(NautobotModelForm):
-    """ControllerDeviceGroup create/edit form."""
+class ControllerManagedDeviceGroupForm(NautobotModelForm):
+    """ControllerManagedDeviceGroup create/edit form."""
 
-    controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=False)
+    controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=True)
     devices = DynamicModelMultipleChoiceField(queryset=Device.objects.all(), required=False)
-    parent = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
+    parent = DynamicModelChoiceField(queryset=ControllerManagedDeviceGroup.objects.all(), required=False)
 
     class Meta:
-        model = ControllerDeviceGroup
+        model = ControllerManagedDeviceGroup
         fields = (
-            "name",
             "controller",
+            "name",
             "devices",
             "parent",
             "weight",
@@ -4275,13 +4298,10 @@ class ControllerDeviceGroupForm(NautobotModelForm):
         return instance
 
 
-class ControllerDeviceGroupFilterForm(
-    LocalContextFilterForm,
-    NautobotFilterForm,
-):
-    """ControllerDeviceGroup basic filter form."""
+class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
+    """ControllerManagedDeviceGroup basic filter form."""
 
-    model = ControllerDeviceGroup
+    model = ControllerManagedDeviceGroup
     q = forms.CharField(required=False, label="Search")
     name = forms.CharField(required=False, label="Name")
     controller = DynamicModelChoiceField(
@@ -4290,13 +4310,13 @@ class ControllerDeviceGroupFilterForm(
         label="Controller",
     )
     parent = DynamicModelChoiceField(
-        queryset=ControllerDeviceGroup.objects.all(),
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         required=False,
         label="Parent",
     )
     weight = forms.IntegerField(required=False, label="Weight")
     subtree = DynamicModelMultipleChoiceField(
-        queryset=ControllerDeviceGroup.objects.all(),
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         to_field_name="name",
         required=False,
     )
@@ -4312,23 +4332,19 @@ class ControllerDeviceGroupFilterForm(
     )
 
 
-class ControllerDeviceGroupBulkEditForm(
-    TagsBulkEditFormMixin,
-    NautobotBulkEditForm,
-    LocalContextModelBulkEditForm,
-):
-    """ControllerDeviceGroup bulk edit form."""
+class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
+    """ControllerManagedDeviceGroup bulk edit form."""
 
     pk = forms.ModelMultipleChoiceField(
-        queryset=ControllerDeviceGroup.objects.all(),
+        queryset=ControllerManagedDeviceGroup.objects.all(),
         widget=forms.MultipleHiddenInput,
     )
     controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=False)
-    parent = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
+    parent = DynamicModelChoiceField(queryset=ControllerManagedDeviceGroup.objects.all(), required=False)
     weight = forms.IntegerField(required=False)
 
     class Meta:
-        model = ControllerDeviceGroup
+        model = ControllerManagedDeviceGroup
         fields = (
             "controller",
             "parent",

nautobot/dcim/homepage.py

@@ -79,13 +79,21 @@ layout = (
                 description="Represents a set of devices which share a common control plane",
                 weight=400,
             ),
+            HomePageItem(
+                name="Controllers",
+                link="dcim:controller_list",
+                model=models.Controller,
+                permissions=["dcim.view_controller"],
+                description="Represents a network or SDN (Software-Defined Networking) controllers",
+                weight=500,
+            ),
             HomePageItem(
                 name="Device Redundancy Groups",
                 link="dcim:deviceredundancygroup_list",
                 model=models.DeviceRedundancyGroup,
                 permissions=["dcim.view_deviceredundancygroup"],
                 description="Represents a set of devices which operate in a failover/HA group",
-                weight=500,
+                weight=600,
             ),
             HomePageItem(
                 name="Interface Redundancy Groups",
@@ -93,11 +101,11 @@ layout = (
                 model=models.InterfaceRedundancyGroup,
                 permissions=["dcim.view_interfaceredundancygroup"],
                 description="Represents a set of interfaces which operate in a failover/HA group",
-                weight=550,
+                weight=700,
             ),
             HomePageGroup(
                 name="Connections",
-                weight=600,
+                weight=800,
                 items=(
                     HomePageItem(
                         name="Cables",