nautobot 2.4.10__py3-none-any.whl → 2.4.11__py3-none-any.whl

nautobot/dcim/api/urls.py

@@ -17,6 +17,7 @@ router.register("rack-reservations", views.RackReservationViewSet)
 router.register("manufacturers", views.ManufacturerViewSet)
 router.register("device-families", views.DeviceFamilyViewSet)
 router.register("device-types", views.DeviceTypeViewSet)
+router.register("module-families", views.ModuleFamilyViewSet)
 router.register("module-types", views.ModuleTypeViewSet)
 
 # Device type and Module type components

nautobot/dcim/api/views.py

@@ -54,6 +54,7 @@ from nautobot.dcim.models import (
     Module,
     ModuleBay,
     ModuleBayTemplate,
+    ModuleFamily,
     ModuleType,
     Platform,
     PowerFeed,
@@ -644,6 +645,14 @@ class CableViewSet(NautobotModelViewSet):
     serializer_class = serializers.CableSerializer
     filterset_class = filters.CableFilterSet
 
+    def get_queryset(self):
+        # 6933 fix: with prefetch related in queryset
+        # DeviceInterface is not properly cleared of _path_id
+        queryset = super().get_queryset()
+        if self.action == "destroy":
+            queryset = queryset.prefetch_related(None)
+        return queryset
+
 
 #
 # Virtual chassis
@@ -836,3 +845,14 @@ class InterfaceVDCAssignmentViewSet(ModelViewSet):
     queryset = InterfaceVDCAssignment.objects.all()
     serializer_class = serializers.InterfaceVDCAssignmentSerializer
     filterset_class = filters.InterfaceVDCAssignmentFilterSet
+
+
+class ModuleFamilyViewSet(NautobotModelViewSet):
+    """API viewset for interacting with ModuleFamily objects."""
+
+    queryset = ModuleFamily.objects.annotate(
+        module_type_count=count_related(ModuleType, "module_family"),
+        module_bay_count=count_related(ModuleBay, "module_family"),
+    )
+    serializer_class = serializers.ModuleFamilySerializer
+    filterset_class = filters.ModuleFamilyFilterSet

nautobot/dcim/apps.py

@@ -14,6 +14,7 @@ class DCIMConfig(NautobotConfig):
         "devicetype",
         "location",
         "module",
+        "modulefamily",
         "moduletype",
         "powerfeed",
         "rack",

nautobot/dcim/factory.py

@@ -49,6 +49,7 @@ from nautobot.dcim.models import (
     Module,
     ModuleBay,
     ModuleBayTemplate,
+    ModuleFamily,
     ModuleType,
     Platform,
     PowerOutletTemplate,
@@ -787,6 +788,7 @@ class ModuleTypeFactory(PrimaryModelFactory):
         exclude = ("has_part_number", "has_comments")
 
     manufacturer = random_instance(Manufacturer, allow_null=False)
+    module_family = random_instance(ModuleFamily, allow_null=True)
 
     has_part_number = NautobotBoolIterator()
     part_number = factory.Maybe("has_part_number", factory.Faker("ean", length=8), "")
@@ -970,6 +972,15 @@ class ModuleBayTemplateFactory(ModularDeviceComponentTemplateFactory):
         factory.LazyAttribute(lambda o: o.module_type.module_bay_templates.count() + 1),
     )
 
+    class Params:
+        has_module_family = NautobotBoolIterator()
+
+    module_family = factory.Maybe(
+        "has_module_family",
+        random_instance(ModuleFamily),
+        None,
+    )
+
 
 class VirtualDeviceContextFactory(PrimaryModelFactory):
     class Meta:

nautobot/dcim/filters/__init__.py

@@ -74,6 +74,7 @@ from nautobot.dcim.models import (
     Module,
     ModuleBay,
     ModuleBayTemplate,
+    ModuleFamily,
     ModuleType,
     Platform,
     PowerFeed,
@@ -137,6 +138,7 @@ __all__ = (
     "ManufacturerFilterSet",
     "ModuleBayFilterSet",
     "ModuleBayTemplateFilterSet",
+    "ModuleFamilyFilterSet",
     "ModuleFilterSet",
     "ModuleTypeFilterSet",
     "PathEndpointFilterSet",
@@ -2072,6 +2074,12 @@ class ModuleFilterSet(
         to_field_name="model",
         label="Module type (model or ID)",
     )
+    module_family = NaturalKeyOrPKMultipleChoiceFilter(
+        field_name="module_type__module_family",
+        queryset=ModuleFamily.objects.all(),
+        to_field_name="name",
+        label="Module family (name or ID)",
+    )
     parent_module_bay = django_filters.ModelMultipleChoiceFilter(
         queryset=ModuleBay.objects.all(),
         label="Parent Module Bay",
@@ -2082,6 +2090,13 @@ class ModuleFilterSet(
         label="Device (name or ID)",
         method="filter_device",
     )
+    compatible_with_module_bay = extend_schema_field({"type": "string", "format": "uuid"})(
+        django_filters.ModelChoiceFilter(
+            queryset=ModuleBay.objects.all(),
+            method="filter_module_bay",
+            label="Compatible with module bay (ID)",
+        )
+    )
 
     def _construct_device_filter_recursively(self, field_name, value):
         recursion_depth = MODULE_RECURSION_DEPTH_LIMIT
@@ -2107,6 +2122,12 @@ class ModuleFilterSet(
         params = self.generate_query_filter_device(value)
         return queryset.filter(params)
 
+    def filter_module_bay(self, queryset, name, value):
+        """Filter modules based on a module bay's module family."""
+        if value and value.module_family:
+            return queryset.filter(module_type__module_family=value.module_family)
+        return queryset
+
     class Meta:
         model = Module
         fields = "__all__"
@@ -2133,6 +2154,23 @@ class ModuleTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
             },
         },
     )
+    manufacturer = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Manufacturer.objects.all(),
+        to_field_name="name",
+        label="Manufacturer (name or ID)",
+    )
+    module_family = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ModuleFamily.objects.all(),
+        to_field_name="name",
+        label="Module family (name or ID)",
+    )
+    compatible_with_module_bay = extend_schema_field({"type": "string", "format": "uuid"})(
+        django_filters.ModelChoiceFilter(
+            queryset=ModuleBay.objects.all(),
+            method="filter_module_bay",
+            label="Installable in module bay (ID)",
+        )
+    )
     has_modules = RelatedMembershipBooleanFilter(
         field_name="modules",
         label="Has module instances",
@@ -2142,6 +2180,12 @@ class ModuleTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
         model = ModuleType
         fields = "__all__"
 
+    def filter_module_bay(self, queryset, name, value):
+        """Filter module types based on a module bay's module family."""
+        if value and value.module_family:
+            return queryset.filter(module_family=value.module_family)
+        return queryset
+
 
 class ModuleBayTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMixin, NautobotFilterSet):
     q = SearchFilter(
@@ -2172,6 +2216,14 @@ class ModuleBayTemplateFilterSet(ModularDeviceComponentTemplateModelFilterSetMix
             },
         }
     )
+    module_family = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ModuleFamily.objects.all(),
+        to_field_name="name",
+        label="Module family (name or ID)",
+    )
+    requires_first_party_modules = django_filters.BooleanFilter(
+        label="Requires first-party modules",
+    )
 
     class Meta:
         model = ModuleBayTemplate
@@ -2228,6 +2280,15 @@ class ModuleBayFilterSet(NautobotFilterSet):
         field_name="installed_module",
         label="Has installed module",
     )
+    module_family = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ModuleFamily.objects.all(),
+        to_field_name="name",
+        label="Module family (name or ID)",
+    )
+    requires_first_party_modules = django_filters.BooleanFilter(
+        field_name="requires_first_party_modules",
+        label="Requires first-party modules",
+    )
 
     class Meta:
         model = ModuleBay
@@ -2362,3 +2423,52 @@ class InterfaceVDCAssignmentFilterSet(NautobotFilterSet):
             "interface",
             "virtual_device_context",
         ]
+
+
+class ModuleFamilyFilterSet(NautobotFilterSet):
+    """FilterSet for ModuleFamily objects."""
+
+    q = SearchFilter(
+        filter_predicates={
+            "name": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "description": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "module_types__model": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+            "module_types__manufacturer__name": {
+                "lookup_expr": "icontains",
+                "preprocessor": str.strip,
+            },
+        }
+    )
+
+    module_types = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=ModuleType.objects.all(),
+        to_field_name="model",
+        label="Module types (model or ID)",
+    )
+
+    module_bay_id = extend_schema_field({"type": "array", "items": {"type": "string", "format": "uuid"}})(
+        django_filters.ModelMultipleChoiceFilter(
+            queryset=ModuleBay.objects.all(),
+            label="Module bay (ID)",
+        )
+    )
+
+    class Meta:
+        model = ModuleFamily
+        fields = [
+            "id",
+            "name",
+            "description",
+            "module_types",
+            "module_bay_id",
+            "tags",
+        ]