nautobot 2.4.0b1__py3-none-any.whl → 2.4.1__py3-none-any.whl

nautobot/dcim/api/views.py

@@ -11,6 +11,7 @@ from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema, OpenApiParameter
 from rest_framework.decorators import action
 from rest_framework.mixins import ListModelMixin
+from rest_framework.parsers import JSONParser, MultiPartParser
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ViewSet
@@ -18,6 +19,7 @@ from rest_framework.viewsets import GenericViewSet, ViewSet
 from nautobot.circuits.models import Circuit
 from nautobot.cloud.models import CloudAccount
 from nautobot.core.api.exceptions import ServiceUnavailable
+from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.utils import get_serializer_for_model
 from nautobot.core.api.views import ModelViewSet
 from nautobot.core.models.querysets import count_related
@@ -76,7 +78,7 @@ from nautobot.extras.api.views import (
 )
 from nautobot.extras.choices import SecretsGroupAccessTypeChoices, SecretsGroupSecretTypeChoices
 from nautobot.extras.secrets.exceptions import SecretError
-from nautobot.ipam.models import Prefix, VLAN
+from nautobot.ipam.models import IPAddress, Prefix, VLAN
 from nautobot.virtualization.models import VirtualMachine
 
 from . import serializers
@@ -140,7 +142,7 @@ class PassThroughPortMixin:
 
 
 class LocationTypeViewSet(NautobotModelViewSet):
-    queryset = LocationType.objects.select_related("parent").prefetch_related("content_types")
+    queryset = LocationType.objects.all()
     serializer_class = serializers.LocationTypeSerializer
     filterset_class = filters.LocationTypeFilterSet
 
@@ -151,17 +153,13 @@ class LocationTypeViewSet(NautobotModelViewSet):
 
 
 class LocationViewSet(NautobotModelViewSet):
-    queryset = (
-        Location.objects.select_related("location_type", "parent", "status", "tenant")
-        .prefetch_related("tags")
-        .annotate(
-            device_count=count_related(Device, "location"),
-            rack_count=count_related(Rack, "location"),
-            prefix_count=count_related(Prefix, "locations"),
-            vlan_count=count_related(VLAN, "locations"),
-            circuit_count=count_related(Circuit, "circuit_terminations__location"),
-            virtual_machine_count=count_related(VirtualMachine, "cluster__location"),
-        )
+    queryset = Location.objects.annotate(
+        device_count=count_related(Device, "location"),
+        rack_count=count_related(Rack, "location"),
+        prefix_count=count_related(Prefix, "locations"),
+        vlan_count=count_related(VLAN, "locations"),
+        circuit_count=count_related(Circuit, "circuit_terminations__location"),
+        virtual_machine_count=count_related(VirtualMachine, "cluster__location"),
     )
     serializer_class = serializers.LocationSerializer
     filterset_class = filters.LocationFilterSet
@@ -173,7 +171,7 @@ class LocationViewSet(NautobotModelViewSet):
 
 
 class RackGroupViewSet(NautobotModelViewSet):
-    queryset = RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group")).select_related("location")
+    queryset = RackGroup.objects.annotate(rack_count=count_related(Rack, "rack_group"))
     serializer_class = serializers.RackGroupSerializer
     filterset_class = filters.RackGroupFilterSet
 
@@ -184,13 +182,9 @@ class RackGroupViewSet(NautobotModelViewSet):
 
 
 class RackViewSet(NautobotModelViewSet):
-    queryset = (
-        Rack.objects.select_related("location", "rack_group__location", "status", "role", "tenant")
-        .prefetch_related("tags")
-        .annotate(
-            device_count=count_related(Device, "rack"),
-            power_feed_count=count_related(PowerFeed, "rack"),
-        )
+    queryset = Rack.objects.select_related("rack_group__location").annotate(
+        device_count=count_related(Device, "rack"),
+        power_feed_count=count_related(PowerFeed, "rack"),
     )
     serializer_class = serializers.RackSerializer
     filterset_class = filters.RackFilterSet
@@ -255,7 +249,7 @@ class RackViewSet(NautobotModelViewSet):
 
 
 class RackReservationViewSet(NautobotModelViewSet):
-    queryset = RackReservation.objects.select_related("rack", "user", "tenant")
+    queryset = RackReservation.objects.all()
     serializer_class = serializers.RackReservationSerializer
     filterset_class = filters.RackReservationFilterSet
 
@@ -295,13 +289,10 @@ class DeviceFamilyViewSet(NautobotModelViewSet):
 
 
 class DeviceTypeViewSet(NautobotModelViewSet):
-    queryset = (
-        DeviceType.objects.select_related("manufacturer")
-        .prefetch_related("software_image_files", "tags")
-        .annotate(device_count=count_related(Device, "device_type"))
-    )
+    queryset = DeviceType.objects.annotate(device_count=count_related(Device, "device_type"))
     serializer_class = serializers.DeviceTypeSerializer
     filterset_class = filters.DeviceTypeFilterSet
+    parser_classes = [JSONParser, NautobotCSVParser, MultiPartParser]
 
 
 #
@@ -387,21 +378,8 @@ class PlatformViewSet(NautobotModelViewSet):
 class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
     queryset = Device.objects.select_related(
         "device_type__manufacturer",
-        "role",
-        "tenant",
-        "platform",
-        "rack",
-        "location",
-        "parent_bay",
-        "primary_ip4",
-        "primary_ip6",
-        "software_version",
         "virtual_chassis__master",
-        "device_redundancy_group",
-        "controller_managed_device_group",
-        "secrets_group",
-        "status",
-    ).prefetch_related("tags", "primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list", "software_image_files")
+    ).prefetch_related("primary_ip4__nat_outside_list", "primary_ip6__nat_outside_list")
     serializer_class = serializers.DeviceSerializer
     filterset_class = filters.DeviceFilterSet
 
@@ -564,85 +542,65 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
 
 
 class ConsolePortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = ConsolePort.objects.select_related("device", "cable").prefetch_related(
-        "_path__destination", "_cable_peer", "tags"
-    )
+    queryset = ConsolePort.objects.prefetch_related("_path__destination", "_cable_peer")
     serializer_class = serializers.ConsolePortSerializer
     filterset_class = filters.ConsolePortFilterSet
 
 
 class ConsoleServerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = ConsoleServerPort.objects.select_related("device", "cable").prefetch_related(
-        "_path__destination", "_cable_peer", "tags"
-    )
+    queryset = ConsoleServerPort.objects.prefetch_related("_path__destination", "_cable_peer")
     serializer_class = serializers.ConsoleServerPortSerializer
     filterset_class = filters.ConsoleServerPortFilterSet
 
 
 class PowerPortViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerPort.objects.select_related("device", "cable").prefetch_related(
-        "_path__destination", "_cable_peer", "tags"
-    )
+    queryset = PowerPort.objects.prefetch_related("_path__destination", "_cable_peer")
     serializer_class = serializers.PowerPortSerializer
     filterset_class = filters.PowerPortFilterSet
 
 
 class PowerOutletViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerOutlet.objects.select_related("device", "cable").prefetch_related(
-        "_path__destination", "_cable_peer", "tags"
-    )
+    queryset = PowerOutlet.objects.prefetch_related("_path__destination", "_cable_peer")
     serializer_class = serializers.PowerOutletSerializer
     filterset_class = filters.PowerOutletFilterSet
 
 
 class InterfaceViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = Interface.objects.select_related(
-        "device",
-        "parent_interface",
-        "bridge",
-        "lag",
-        "status",
-        "cable",
-        "untagged_vlan",
-    ).prefetch_related(
-        "tags", "_path__destination", "_cable_peer", "ip_addresses", "tagged_vlans", "virtual_device_contexts"
+    queryset = Interface.objects.prefetch_related("_path__destination", "_cable_peer").annotate(
+        _ip_address_count=count_related(IPAddress, "interfaces")  # avoid conflict with Interface.ip_address_count()
     )
     serializer_class = serializers.InterfaceSerializer
     filterset_class = filters.InterfaceFilterSet
 
 
 class FrontPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
-    queryset = FrontPort.objects.select_related(
-        "device__device_type__manufacturer", "rear_port", "cable"
-    ).prefetch_related("tags")
+    queryset = FrontPort.objects.select_related("device__device_type__manufacturer")
     serializer_class = serializers.FrontPortSerializer
     filterset_class = filters.FrontPortFilterSet
 
 
 class RearPortViewSet(PassThroughPortMixin, NautobotModelViewSet):
-    queryset = RearPort.objects.select_related("device__device_type__manufacturer", "cable").prefetch_related("tags")
+    queryset = RearPort.objects.select_related("device__device_type__manufacturer")
     serializer_class = serializers.RearPortSerializer
     filterset_class = filters.RearPortFilterSet
 
 
 class DeviceBayViewSet(NautobotModelViewSet):
-    queryset = DeviceBay.objects.select_related("installed_device").prefetch_related("tags")
+    queryset = DeviceBay.objects.all()
     serializer_class = serializers.DeviceBaySerializer
     filterset_class = filters.DeviceBayFilterSet
 
 
 class InventoryItemViewSet(NautobotModelViewSet):
-    queryset = InventoryItem.objects.select_related("device", "manufacturer", "software_version").prefetch_related(
-        "tags"
-    )
+    queryset = InventoryItem.objects.all()
     serializer_class = serializers.InventoryItemSerializer
     filterset_class = filters.InventoryItemFilterSet
 
 
 class ModuleBayViewSet(NautobotModelViewSet):
-    queryset = ModuleBay.objects.select_related(
-        "parent_device__tenant", "parent_device__location", "parent_module"
-    ).prefetch_related("installed_module", "tags")
+    queryset = ModuleBay.objects.select_related("parent_device__tenant", "parent_device__location").prefetch_related(
+        "installed_module"
+    )
     serializer_class = serializers.ModuleBaySerializer
     filterset_class = filters.ModuleBayFilterSet
 
@@ -681,7 +639,7 @@ class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet):
 
 
 class CableViewSet(NautobotModelViewSet):
-    queryset = Cable.objects.select_related("status").prefetch_related("termination_a", "termination_b")
+    queryset = Cable.objects.prefetch_related("termination_a", "termination_b")
     serializer_class = serializers.CableSerializer
     filterset_class = filters.CableFilterSet
 
@@ -692,9 +650,7 @@ class CableViewSet(NautobotModelViewSet):
 
 
 class VirtualChassisViewSet(NautobotModelViewSet):
-    queryset = VirtualChassis.objects.prefetch_related("tags").annotate(
-        member_count=count_related(Device, "virtual_chassis")
-    )
+    queryset = VirtualChassis.objects.annotate(member_count=count_related(Device, "virtual_chassis"))
     serializer_class = serializers.VirtualChassisSerializer
     filterset_class = filters.VirtualChassisFilterSet
 
@@ -705,9 +661,7 @@ class VirtualChassisViewSet(NautobotModelViewSet):
 
 
 class PowerPanelViewSet(NautobotModelViewSet):
-    queryset = PowerPanel.objects.select_related("location", "rack_group").annotate(
-        power_feed_count=count_related(PowerFeed, "power_panel")
-    )
+    queryset = PowerPanel.objects.annotate(power_feed_count=count_related(PowerFeed, "power_panel"))
     serializer_class = serializers.PowerPanelSerializer
     filterset_class = filters.PowerPanelFilterSet
 
@@ -718,12 +672,7 @@ class PowerPanelViewSet(NautobotModelViewSet):
 
 
 class PowerFeedViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = PowerFeed.objects.select_related(
-        "power_panel",
-        "rack",
-        "cable",
-        "status",
-    ).prefetch_related("tags", "_cable_peer", "_path__destination")
+    queryset = PowerFeed.objects.prefetch_related("_cable_peer", "_path__destination")
     serializer_class = serializers.PowerFeedSerializer
     filterset_class = filters.PowerFeedFilterSet
 
@@ -734,7 +683,7 @@ class PowerFeedViewSet(PathEndpointMixin, NautobotModelViewSet):
 
 
 class DeviceRedundancyGroupViewSet(NautobotModelViewSet):
-    queryset = DeviceRedundancyGroup.objects.select_related("status").prefetch_related("devices")
+    queryset = DeviceRedundancyGroup.objects.all()
     serializer_class = serializers.DeviceRedundancyGroupSerializer
     filterset_class = filters.DeviceRedundancyGroupFilterSet
 
@@ -745,7 +694,7 @@ class DeviceRedundancyGroupViewSet(NautobotModelViewSet):
 
 
 class InterfaceRedundancyGroupViewSet(NautobotModelViewSet):
-    queryset = InterfaceRedundancyGroup.objects.select_related("status").prefetch_related("interfaces")
+    queryset = InterfaceRedundancyGroup.objects.all()
     serializer_class = serializers.InterfaceRedundancyGroupSerializer
     filterset_class = filters.InterfaceRedundancyGroupFilterSet
 
@@ -821,21 +770,19 @@ class ConnectedDeviceViewSet(ViewSet):
 
 
 class SoftwareImageFileViewSet(NautobotModelViewSet):
-    queryset = SoftwareImageFile.objects.select_related("software_version").prefetch_related("device_types")
+    queryset = SoftwareImageFile.objects.all()
     serializer_class = serializers.SoftwareImageFileSerializer
     filterset_class = filters.SoftwareImageFileFilterSet
 
 
 class SoftwareVersionViewSet(NautobotModelViewSet):
-    queryset = SoftwareVersion.objects.select_related("platform").prefetch_related(
-        "devices", "software_image_files", "inventory_items", "virtual_machines"
-    )
+    queryset = SoftwareVersion.objects.all()
     serializer_class = serializers.SoftwareVersionSerializer
     filterset_class = filters.SoftwareVersionFilterSet
 
 
 class DeviceTypeToSoftwareImageFileViewSet(ModelViewSet):
-    queryset = DeviceTypeToSoftwareImageFile.objects.select_related("device_type", "software_image_file")
+    queryset = DeviceTypeToSoftwareImageFile.objects.all()
     serializer_class = serializers.DeviceTypeToSoftwareImageFileSerializer
     filterset_class = filters.DeviceTypeToSoftwareImageFileFilterSet
 
@@ -846,23 +793,13 @@ class DeviceTypeToSoftwareImageFileViewSet(ModelViewSet):
 
 
 class ControllerViewSet(NautobotModelViewSet):
-    queryset = Controller.objects.select_related(
-        "location",
-        "platform",
-        "role",
-        "tenant",
-        "status",
-    ).prefetch_related("tags")
+    queryset = Controller.objects.all()
     serializer_class = serializers.ControllerSerializer
     filterset_class = filters.ControllerFilterSet
 
 
 class ControllerManagedDeviceGroupViewSet(NautobotModelViewSet):
-    queryset = ControllerManagedDeviceGroup.objects.select_related(
-        "controller",
-        "parent",
-    ).prefetch_related("tags")
-
+    queryset = ControllerManagedDeviceGroup.objects.all()
     serializer_class = serializers.ControllerManagedDeviceGroupSerializer
     filterset_class = filters.ControllerManagedDeviceGroupFilterSet
 
@@ -877,27 +814,24 @@ class ModuleViewSet(NautobotModelViewSet):
         "parent_module_bay__parent_device__location",
         "parent_module_bay__parent_device__tenant",
         "module_type__manufacturer",
-        "tenant",
-        "role",
-        "location",
-    ).prefetch_related("module_bays", "tags")
+    )
     serializer_class = serializers.ModuleSerializer
     filterset_class = filters.ModuleFilterSet
 
 
 class ModuleTypeViewSet(NautobotModelViewSet):
-    queryset = ModuleType.objects.select_related("manufacturer").prefetch_related("tags", "modules")
+    queryset = ModuleType.objects.all()
     serializer_class = serializers.ModuleTypeSerializer
     filterset_class = filters.ModuleTypeFilterSet
 
 
 class VirtualDeviceContextViewSet(NautobotModelViewSet):
-    queryset = VirtualDeviceContext.objects.select_related("device", "tenant", "primary_ip4", "primary_ip6", "role")
+    queryset = VirtualDeviceContext.objects.all()
     serializer_class = serializers.VirtualDeviceContextSerializer
     filterset_class = filters.VirtualDeviceContextFilterSet
 
 
 class InterfaceVDCAssignmentViewSet(NautobotModelViewSet):
-    queryset = InterfaceVDCAssignment.objects.select_related("virtual_device_context", "interface")
+    queryset = InterfaceVDCAssignment.objects.all()
     serializer_class = serializers.InterfaceVDCAssignmentSerializer
     filterset_class = filters.InterfaceVDCAssignmentFilterSet

nautobot/dcim/constants.py

@@ -27,19 +27,12 @@ REARPORT_POSITIONS_MAX = 1024
 INTERFACE_MTU_MIN = 1
 INTERFACE_MTU_MAX = 32767  # Max value of a signed 16-bit integer
 
-VIRTUAL_IFACE_TYPES = [
-    InterfaceTypeChoices.TYPE_VIRTUAL,
-    InterfaceTypeChoices.TYPE_BRIDGE,
-    InterfaceTypeChoices.TYPE_LAG,
-]
-
-WIRELESS_IFACE_TYPES = [
-    InterfaceTypeChoices.TYPE_80211A,
-    InterfaceTypeChoices.TYPE_80211G,
-    InterfaceTypeChoices.TYPE_80211N,
-    InterfaceTypeChoices.TYPE_80211AC,
-    InterfaceTypeChoices.TYPE_80211AD,
-]
+interface_type_by_category = {}
+for category_name, category_item_tuples in InterfaceTypeChoices.CHOICES:
+    interface_type_by_category[category_name] = [item_tuple[0] for item_tuple in category_item_tuples]
+
+WIRELESS_IFACE_TYPES = interface_type_by_category["Wireless"]
+VIRTUAL_IFACE_TYPES = interface_type_by_category["Virtual interfaces"]
 
 NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
 

nautobot/dcim/factory.py

@@ -201,7 +201,12 @@ class DeviceFactory(PrimaryModelFactory):
         if extracted:
             self.software_image_files.set(extracted)
         else:
-            self.software_image_files.set(get_random_instances(SoftwareImageFile))
+            self.software_image_files.set(
+                get_random_instances(
+                    SoftwareImageFile.objects.filter(default_image=True)
+                    | SoftwareImageFile.objects.filter(device_types=self.device_type)
+                )
+            )
 
     # TODO to be done after these model factories are done.
     # has_cluster = NautobotBoolIterator()

nautobot/dcim/filters/__init__.py

@@ -128,8 +128,8 @@ __all__ = (
     "FrontPortTemplateFilterSet",
     "InterfaceConnectionFilterSet",
     "InterfaceFilterSet",
-    "InterfaceRedundancyGroupFilterSet",
     "InterfaceRedundancyGroupAssociationFilterSet",
+    "InterfaceRedundancyGroupFilterSet",
     "InterfaceTemplateFilterSet",
     "InventoryItemFilterSet",
     "LocationFilterSet",
@@ -907,6 +907,12 @@ class DeviceFilterSet(
         to_field_name="version",
         label="Software version (version or ID)",
     )
+    ip_addresses = MultiValueCharFilter(
+        method="filter_ip_addresses",
+        label="IP addresses (address or ID)",
+        distinct=True,
+    )
+    has_ip_addresses = RelatedMembershipBooleanFilter(field_name="interfaces__ip_addresses", label="Has IP addresses")
     radio_profiles = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="controller_managed_device_group__radio_profiles",
         queryset=RadioProfile.objects.all(),
@@ -928,6 +934,13 @@ class DeviceFilterSet(
         label="Has wireless networks",
     )
 
+    def filter_ip_addresses(self, queryset, name, value):
+        pk_values = set(item for item in value if is_uuid(item))
+        addresses = set(item for item in value if item not in pk_values)
+
+        ip_queryset = IPAddress.objects.filter_address_or_pk_in(addresses, pk_values)
+        return queryset.filter(interfaces__ip_addresses__in=ip_queryset).distinct()
+
     class Meta:
         model = Device
         fields = [
@@ -1154,6 +1167,12 @@ class InterfaceFilterSet(
         queryset=InterfaceRedundancyGroup.objects.all(),
         to_field_name="name",
     )
+    ip_addresses = MultiValueCharFilter(
+        method="filter_ip_addresses",
+        label="IP addresses (address or ID)",
+        distinct=True,
+    )
+    has_ip_addresses = RelatedMembershipBooleanFilter(field_name="ip_addresses", label="Has IP addresses")
     virtual_device_contexts = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=VirtualDeviceContext.objects.all(),
         to_field_name="name",
@@ -1164,6 +1183,13 @@ class InterfaceFilterSet(
         label="Has Virtual Device Context",
     )
 
+    def filter_ip_addresses(self, queryset, name, value):
+        pk_values = set(item for item in value if is_uuid(item))
+        addresses = set(item for item in value if item not in pk_values)
+
+        ip_queryset = IPAddress.objects.filter_address_or_pk_in(addresses, pk_values)
+        return queryset.filter(ip_addresses__in=ip_queryset).distinct()
+
     class Meta:
         model = Interface
         fields = [
@@ -1884,7 +1910,10 @@ class ControllerFilterSet(
         fields = "__all__"
 
 
-class ControllerManagedDeviceGroupFilterSet(NautobotFilterSet):
+class ControllerManagedDeviceGroupFilterSet(
+    NautobotFilterSet,
+    TenancyModelFilterSetMixin,
+):
     """Filters for ControllerManagedDeviceGroup model."""
 
     q = SearchFilter(