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

nautobot/dcim/api/views.py

@@ -13,6 +13,7 @@ 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
@@ -29,7 +30,7 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -75,6 +76,16 @@ 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
 
 
@@ -380,7 +391,7 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
         "software_version",
         "virtual_chassis__master",
         "device_redundancy_group",
-        "controller_managed_device_group",
+        "controller_device_group",
         "secrets_group",
         "status",
     ).prefetch_related("tags", "primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list", "software_image_files")
@@ -775,7 +786,7 @@ class ConnectedDeviceViewSet(ViewSet):
 
         # Determine local interface from peer interface's connection
         peer_interface = get_object_or_404(
-            Interface.objects.restrict(request.user, "view"),
+            Interface.objects.all(),
             device__name=peer_device_name,
             name=peer_interface_name,
         )
@@ -829,11 +840,11 @@ class ControllerViewSet(NautobotModelViewSet):
     filterset_class = filters.ControllerFilterSet
 
 
-class ControllerManagedDeviceGroupViewSet(NautobotModelViewSet):
-    queryset = ControllerManagedDeviceGroup.objects.select_related(
+class ControllerDeviceGroupViewSet(NautobotModelViewSet):
+    queryset = ControllerDeviceGroup.objects.select_related(
         "controller",
         "parent",
     ).prefetch_related("tags")
 
-    serializer_class = serializers.ControllerManagedDeviceGroupSerializer
-    filterset_class = filters.ControllerManagedDeviceGroupFilterSet
+    serializer_class = serializers.ControllerDeviceGroupSerializer
+    filterset_class = filters.ControllerDeviceGroupFilterSet

nautobot/dcim/factory.py

@@ -26,7 +26,7 @@ from nautobot.dcim.choices import (
 )
 from nautobot.dcim.models import (
     Controller,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceFamily,
     DeviceRedundancyGroup,
@@ -167,7 +167,7 @@ class DeviceFactory(PrimaryModelFactory):
         factory.Faker("pyint", min_value=1, max_value=500),
     )
 
-    controller_managed_device_group = random_instance(ControllerManagedDeviceGroup)
+    controller_device_group = random_instance(ControllerDeviceGroup)
 
     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)
-    controller_device = factory.Maybe("has_device", random_instance(Device), None)
-    controller_device_redundancy_group = factory.Maybe("has_device", None, random_instance(DeviceRedundancyGroup))
+    deployed_controller_device = factory.Maybe("has_device", random_instance(Device), None)
+    deployed_controller_group = factory.Maybe("has_device", None, random_instance(DeviceRedundancyGroup))
 
 
-class ControllerManagedDeviceGroupFactory(PrimaryModelFactory):
+class ControllerDeviceGroupFactory(PrimaryModelFactory):
     class Meta:
-        model = ControllerManagedDeviceGroup
+        model = ControllerDeviceGroup
 
     class Params:
         has_parent = NautobotBoolIterator()
 
     name = UniqueFaker("word")
-    parent = factory.Maybe("has_parent", random_instance(ControllerManagedDeviceGroup), None)
+    parent = factory.Maybe("has_parent", random_instance(ControllerDeviceGroup), 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,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -99,7 +99,7 @@ __all__ = (
     "ConsoleServerPortFilterSet",
     "ConsoleServerPortTemplateFilterSet",
     "ControllerFilterSet",
-    "ControllerManagedDeviceGroupFilterSet",
+    "ControllerDeviceGroupFilterSet",
     "DeviceBayFilterSet",
     "DeviceBayTemplateFilterSet",
     "DeviceFilterSet",
@@ -918,11 +918,11 @@ class DeviceFilterSet(
         to_field_name="name",
         label="Device Redundancy Groups (name or ID)",
     )
-    controller_managed_device_group = NaturalKeyOrPKMultipleChoiceFilter(
-        field_name="controller_managed_device_group",
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+    controller_device_group = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="controller_device_group",
+        queryset=ControllerDeviceGroup.objects.all(),
         to_field_name="name",
-        label="Controller Managed Device Groups (name or ID)",
+        label="Controller Device Groups (name or ID)",
     )
     virtual_chassis_member = is_virtual_chassis_member
     has_console_ports = RelatedMembershipBooleanFilter(
@@ -1842,6 +1842,7 @@ class ControllerFilterSet(
     NautobotFilterSet,
     LocatableModelFilterSetMixin,
     TenancyModelFilterSetMixin,
+    LocalContextModelFilterSetMixin,
     StatusModelFilterSetMixin,
     RoleModelFilterSetMixin,
 ):
@@ -1863,15 +1864,15 @@ class ControllerFilterSet(
         to_field_name="name",
         label="External integration (name or ID)",
     )
-    controller_device = NaturalKeyOrPKMultipleChoiceFilter(
+    deployed_controller_device = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Device.objects.all(),
         to_field_name="name",
-        label="Controller device (name or ID)",
+        label="Deployed controller device (name or ID)",
     )
-    controller_device_redundancy_group = NaturalKeyOrPKMultipleChoiceFilter(
+    deployed_controller_group = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=DeviceRedundancyGroup.objects.all(),
         to_field_name="name",
-        label="Controller device redundancy group (name or ID)",
+        label="Deployed controller group (name or ID)",
     )
 
     class Meta:
@@ -1879,8 +1880,8 @@ class ControllerFilterSet(
         fields = "__all__"
 
 
-class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
-    """Filters for ControllerManagedDeviceGroup model."""
+class ControllerDeviceGroupFilterSet(NautobotFilterSet):
+    """Filters for ControllerDeviceGroup model."""
 
     q = SearchFilter(
         filter_predicates={
@@ -1893,7 +1894,7 @@ class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
         label="Controller (name or ID)",
     )
     parent = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+        queryset=ControllerDeviceGroup.objects.all(),
         to_field_name="name",
         label="Parent group (name or ID)",
     )
@@ -1905,7 +1906,7 @@ class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
     )
 
     class Meta:
-        model = ControllerManagedDeviceGroup
+        model = ControllerDeviceGroup
         fields = "__all__"
 
     def generate_query__subtree(self, value):
@@ -1913,7 +1914,7 @@ class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
         if value:
             params = Q(pk__in=[v.pk for v in value])
             filter_name = "in"
-            for _ in range(ControllerManagedDeviceGroup.objects.max_depth + 1):
+            for _ in range(ControllerDeviceGroup.objects.max_depth + 1):
                 filter_name = f"parent__{filter_name}"
                 params |= Q(**{filter_name: value})
             return params
@@ -1921,6 +1922,6 @@ class ControllerManagedDeviceGroupFilterSet(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 ControllerManagedDeviceGroup(s)."""
+        """FilterSet method for getting Groups that are or are descended from a given ControllerDeviceGroup(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,
-    ControllerManagedDeviceGroup,
+    ControllerDeviceGroup,
     Device,
     DeviceBay,
     DeviceBayTemplate,
@@ -1548,9 +1548,7 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
         },
     )
     device_redundancy_group = DynamicModelChoiceField(queryset=DeviceRedundancyGroup.objects.all(), required=False)
-    controller_managed_device_group = DynamicModelChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(), required=False
-    )
+    controller_device_group = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
     position = forms.IntegerField(
         required=False,
         help_text="The lowest-numbered unit occupied by the device",
@@ -1620,7 +1618,7 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
             "rack",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_managed_device_group",
+            "controller_device_group",
             "position",
             "face",
             "status",
@@ -1762,9 +1760,7 @@ 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_managed_device_group = DynamicModelChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(), required=False
-    )
+    controller_device_group = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
     software_version = DynamicModelChoiceField(queryset=SoftwareVersion.objects.all(), required=False)
     software_image_files = DynamicModelMultipleChoiceField(queryset=SoftwareImageFile.objects.all(), required=False)
 
@@ -1782,7 +1778,7 @@ class DeviceBulkEditForm(
             "secrets_group",
             "device_redundancy_group",
             "device_redundancy_group_priority",
-            "controller_managed_device_group",
+            "controller_device_group",
             "software_image_files",
             "software_version",
         ]
@@ -1862,8 +1858,8 @@ class DeviceFilterForm(
         null_option="None",
     )
     device_redundancy_group_priority = NumericArrayField(base_field=forms.IntegerField(min_value=1), required=False)
-    controller_managed_device_group = DynamicModelMultipleChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+    controller_device_group = DynamicModelMultipleChoiceField(
+        queryset=ControllerDeviceGroup.objects.all(),
         to_field_name="name",
         required=False,
         null_option="None",
@@ -4127,30 +4123,9 @@ class SoftwareVersionForm(NautobotModelForm):
         fields = "__all__"
 
 
-class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
+class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalContextModelForm):
     """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 = (
@@ -4162,14 +4137,15 @@ class ControllerForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
             "tenant",
             "location",
             "external_integration",
-            "controller_device",
-            "controller_device_redundancy_group",
+            "deployed_controller_device",
+            "deployed_controller_group",
             "tags",
         )
 
 
 class ControllerFilterForm(
     NautobotFilterForm,
+    LocalContextFilterForm,
     LocatableModelFilterFormMixin,
     TenancyFilterForm,
     StatusModelFilterFormMixin,
@@ -4191,15 +4167,15 @@ class ControllerFilterForm(
         required=False,
         label="External integration",
     )
-    controller_device = DynamicModelMultipleChoiceField(
+    deployed_controller_device = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label="Controller device",
+        label="Deployed controller device",
     )
-    controller_device_redundancy_group = DynamicModelMultipleChoiceField(
+    deployed_controller_group = DynamicModelMultipleChoiceField(
         queryset=DeviceRedundancyGroup.objects.all(),
         required=False,
-        label="Controller device redundancy group",
+        label="Deployed controller group",
     )
     tags = TagFilterField(model)
     field_order = (
@@ -4212,8 +4188,8 @@ class ControllerFilterForm(
         "platform",
         "tenant",
         "external_integration",
-        "controller_device",
-        "controller_device_redundancy_group",
+        "deployed_controller_device",
+        "deployed_controller_group",
         "tags",
     )
 
@@ -4224,6 +4200,7 @@ class ControllerBulkEditForm(
     StatusModelBulkEditFormMixin,
     RoleModelBulkEditFormMixin,
     NautobotBulkEditForm,
+    LocalContextModelBulkEditForm,
 ):
     """Controller bulk edit form."""
 
@@ -4243,11 +4220,11 @@ class ControllerBulkEditForm(
         queryset=ExternalIntegration.objects.all(),
         required=False,
     )
-    controller_device = DynamicModelChoiceField(
+    deployed_controller_device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False,
     )
-    controller_device_redundancy_group = DynamicModelChoiceField(
+    deployed_controller_group = DynamicModelChoiceField(
         queryset=DeviceRedundancyGroup.objects.all(),
         required=False,
     )
@@ -4262,24 +4239,24 @@ class ControllerBulkEditForm(
             "platform",
             "tenant",
             "external_integration",
-            "controller_device",
-            "controller_device_redundancy_group",
+            "deployed_controller_device",
+            "deployed_controller_group",
             "tags",
         )
 
 
-class ControllerManagedDeviceGroupForm(NautobotModelForm):
-    """ControllerManagedDeviceGroup create/edit form."""
+class ControllerDeviceGroupForm(NautobotModelForm):
+    """ControllerDeviceGroup create/edit form."""
 
-    controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=True)
+    controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=False)
     devices = DynamicModelMultipleChoiceField(queryset=Device.objects.all(), required=False)
-    parent = DynamicModelChoiceField(queryset=ControllerManagedDeviceGroup.objects.all(), required=False)
+    parent = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
 
     class Meta:
-        model = ControllerManagedDeviceGroup
+        model = ControllerDeviceGroup
         fields = (
-            "controller",
             "name",
+            "controller",
             "devices",
             "parent",
             "weight",
@@ -4298,10 +4275,13 @@ class ControllerManagedDeviceGroupForm(NautobotModelForm):
         return instance
 
 
-class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
-    """ControllerManagedDeviceGroup basic filter form."""
+class ControllerDeviceGroupFilterForm(
+    LocalContextFilterForm,
+    NautobotFilterForm,
+):
+    """ControllerDeviceGroup basic filter form."""
 
-    model = ControllerManagedDeviceGroup
+    model = ControllerDeviceGroup
     q = forms.CharField(required=False, label="Search")
     name = forms.CharField(required=False, label="Name")
     controller = DynamicModelChoiceField(
@@ -4310,13 +4290,13 @@ class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
         label="Controller",
     )
     parent = DynamicModelChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+        queryset=ControllerDeviceGroup.objects.all(),
         required=False,
         label="Parent",
     )
     weight = forms.IntegerField(required=False, label="Weight")
     subtree = DynamicModelMultipleChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+        queryset=ControllerDeviceGroup.objects.all(),
         to_field_name="name",
         required=False,
     )
@@ -4332,19 +4312,23 @@ class ControllerManagedDeviceGroupFilterForm(NautobotFilterForm):
     )
 
 
-class ControllerManagedDeviceGroupBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
-    """ControllerManagedDeviceGroup bulk edit form."""
+class ControllerDeviceGroupBulkEditForm(
+    TagsBulkEditFormMixin,
+    NautobotBulkEditForm,
+    LocalContextModelBulkEditForm,
+):
+    """ControllerDeviceGroup bulk edit form."""
 
     pk = forms.ModelMultipleChoiceField(
-        queryset=ControllerManagedDeviceGroup.objects.all(),
+        queryset=ControllerDeviceGroup.objects.all(),
         widget=forms.MultipleHiddenInput,
     )
     controller = DynamicModelChoiceField(queryset=Controller.objects.all(), required=False)
-    parent = DynamicModelChoiceField(queryset=ControllerManagedDeviceGroup.objects.all(), required=False)
+    parent = DynamicModelChoiceField(queryset=ControllerDeviceGroup.objects.all(), required=False)
     weight = forms.IntegerField(required=False)
 
     class Meta:
-        model = ControllerManagedDeviceGroup
+        model = ControllerDeviceGroup
         fields = (
             "controller",
             "parent",

nautobot/dcim/homepage.py

@@ -79,21 +79,13 @@ 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=600,
+                weight=500,
             ),
             HomePageItem(
                 name="Interface Redundancy Groups",
@@ -101,11 +93,11 @@ layout = (
                 model=models.InterfaceRedundancyGroup,
                 permissions=["dcim.view_interfaceredundancygroup"],
                 description="Represents a set of interfaces which operate in a failover/HA group",
-                weight=700,
+                weight=550,
             ),
             HomePageGroup(
                 name="Connections",
-                weight=800,
+                weight=600,
                 items=(
                     HomePageItem(
                         name="Cables",