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

nautobot/ipam/api/serializers.py

@@ -42,7 +42,6 @@ class NamespaceSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = Namespace
         fields = "__all__"
-        list_display_fields = ["name", "description", "location"]
 
 
 #
@@ -54,7 +53,6 @@ class VRFSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = VRF
         fields = "__all__"
-        list_display_fields = ["name", "rd", "tenant", "description"]
         extra_kwargs = {"namespace": {"default": get_default_namespace}}
 
 
@@ -64,16 +62,16 @@ class VRFDeviceAssignmentSerializer(ValidatedModelSerializer):
         fields = "__all__"
         validators = []
 
-    def validate(self, data):
-        if data.get("device"):
+    def validate(self, attrs):
+        if attrs.get("device"):
             validator = UniqueTogetherValidator(queryset=VRFDeviceAssignment.objects.all(), fields=("device", "vrf"))
-            validator(data, self)
-        if data.get("virtual_machine"):
+            validator(attrs, self)
+        if attrs.get("virtual_machine"):
             validator = UniqueTogetherValidator(
                 queryset=VRFDeviceAssignment.objects.all(), fields=("virtual_machine", "vrf")
             )
-            validator(data, self)
-        return super().validate(data)
+            validator(attrs, self)
+        return super().validate(attrs)
 
 
 class VRFPrefixAssignmentSerializer(ValidatedModelSerializer):
@@ -91,7 +89,6 @@ class RouteTargetSerializer(NautobotModelSerializer, TaggedModelSerializerMixin)
     class Meta:
         model = RouteTarget
         fields = "__all__"
-        list_display_fields = ["name", "tenant", "description"]
 
 
 #
@@ -105,12 +102,6 @@ class RIRSerializer(NautobotModelSerializer):
     class Meta:
         model = RIR
         fields = "__all__"
-        list_display_fields = [
-            "name",
-            "is_private",
-            "assigned_prefix_count",
-            "description",
-        ]
 
 
 #
@@ -124,7 +115,6 @@ class VLANGroupSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = VLANGroup
         fields = "__all__"
-        list_display_fields = ["name", "location", "vlan_count", "description"]
 
 
 class VLANSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
@@ -139,34 +129,21 @@ class VLANSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
 
     class Meta:
         model = VLAN
-        # TODO(jathan): These were taken from VLANDetailTable and not VLANTable. Let's make sure
-        # these are correct.
         fields = "__all__"
-        list_display_fields = [
-            "vid",
-            "locations",
-            "vlan_group",
-            "name",
-            "prefixes",
-            "tenant",
-            "status",
-            "role",
-            "description",
-        ]
         validators = []
         extra_kwargs = {"locations": {"read_only": True}}
 
-    def validate(self, data):
+    def validate(self, attrs):
         # Validate uniqueness of vid and name if a group has been assigned.
-        if data.get("vlan_group", None):
+        if attrs.get("vlan_group", None):
             for field in ["vid", "name"]:
                 validator = UniqueTogetherValidator(queryset=VLAN.objects.all(), fields=("vlan_group", field))
-                validator(data, self)
+                validator(attrs, self)
 
         # Enforce model validation
-        super().validate(data)
+        super().validate(attrs)
 
-        return data
+        return attrs
 
 
 class VLANLegacySerializer(VLANSerializer):
@@ -228,52 +205,21 @@ class PrefixSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
         write_only=True,
     )
 
+    def get_field_names(self, declared_fields, info):
+        """Add reverse M2M for VRF's to the fields for this serializer."""
+        field_names = list(super().get_field_names(declared_fields, info))
+        self.extend_field_names(field_names, "vrfs")
+        return field_names
+
     class Meta:
         model = Prefix
         fields = "__all__"
-        list_display_fields = [
-            "prefix",
-            "namespace",
-            "type",
-            "status",
-            "vrf",
-            "tenant",
-            "locations",
-            "vlan",
-            "role",
-            "description",
-        ]
         extra_kwargs = {
             "ip_version": {"read_only": True},
             "namespace": {"default": get_default_namespace},
             "prefix_length": {"read_only": True},
             "locations": {"read_only": True},
-        }
-
-        detail_view_config = {
-            "layout": [
-                {
-                    "Prefix": {
-                        "fields": [
-                            "prefix",
-                            "parent",
-                            "namespace",
-                            "type",
-                            "network",
-                            "broadcast",
-                            "prefix_length",
-                            "ip_version",
-                            "description",
-                            "role",
-                            "vlan",
-                            "locations",
-                            "tenant",
-                            "rir",
-                            "date_allocated",
-                        ]
-                    },
-                },
-            ],
+            "vrfs": {"read_only": True},
         }
 
 
@@ -374,16 +320,6 @@ class IPAddressSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = IPAddress
         fields = "__all__"
-        list_display_fields = [
-            "address",
-            "type",
-            "vrf",
-            "status",
-            "role",
-            "tenant",
-            "dns_name",
-            "description",
-        ]
         extra_kwargs = {
             "ip_version": {"read_only": True},
             "mask_length": {"read_only": True},
@@ -391,42 +327,16 @@ class IPAddressSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
             "parent": {"required": False},
         }
 
-        detail_view_config = {
-            "layout": [
-                {
-                    "IP Address": {
-                        "fields": [
-                            # FixMe(timizuo): Missing in new-ui; resolve when working on #4355
-                            "namespace",
-                            "ip_version",
-                            "type",
-                            "role",
-                            "dns_name",
-                            "description",
-                        ]
-                    },
-                    "Operational Details": {
-                        "fields": [
-                            "tenant",
-                            "assigned",  # FixMe(timizuo) Missing in new-ui; resolve when working on #4355
-                            "nat_inside",
-                            "nat_outside_list",
-                        ]
-                    },
-                },
-            ],
-        }
-
-    def validate(self, data):
-        namespace = data.get("namespace", None)
-        parent = data.get("parent", None)
+    def validate(self, attrs):
+        namespace = attrs.get("namespace", None)
+        parent = attrs.get("parent", None)
 
         # Only assert namespace/parent on create.
         if self.instance is None and not any([namespace, parent]):
             raise ValidationError({"__all__": "One of parent or namespace must be provided"})
 
-        super().validate(data)
-        return data
+        super().validate(attrs)
+        return attrs
 
     def get_field_names(self, declared_fields, info):
         """Add reverse relations to the automatically discovered fields."""
@@ -476,9 +386,9 @@ class IPAllocationSerializer(NautobotModelSerializer, TaggedModelSerializerMixin
             "custom_fields",
         )
 
-    def validate(self, data):
-        data["mask_length"] = self.context["prefix"].prefix_length
-        return super().validate(data)
+    def validate(self, attrs):
+        attrs["mask_length"] = self.context["prefix"].prefix_length
+        return super().validate(attrs)
 
 
 class VLANAllocationSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
@@ -488,11 +398,13 @@ class VLANAllocationSerializer(NautobotModelSerializer, TaggedModelSerializerMix
 
     vid = serializers.IntegerField(required=False, min_value=constants.VLAN_VID_MIN, max_value=constants.VLAN_VID_MAX)
 
-    def validate(self, data):
-        """Skip `ValidatedModel` validation.
+    def validate(self, attrs):
+        """
+        Skip `ValidatedModel` validation.
+
         This allows to skip `vid` attribute of `VLAN` model, while validate name and status.
         """
-        return data
+        return attrs
 
     class Meta(VLANSerializer.Meta):
         model = VLAN
@@ -521,19 +433,19 @@ class IPAddressToInterfaceSerializer(ValidatedModelSerializer):
         fields = "__all__"
         validators = []
 
-    def validate(self, data):
+    def validate(self, attrs):
         # Validate uniqueness of (parent, name) since we omitted the automatically created validator from Meta.
-        if data.get("interface"):
+        if attrs.get("interface"):
             validator = UniqueTogetherValidator(
                 queryset=IPAddressToInterface.objects.all(), fields=("interface", "ip_address")
             )
-            validator(data, self)
-        if data.get("vm_interface"):
+            validator(attrs, self)
+        if attrs.get("vm_interface"):
             validator = UniqueTogetherValidator(
                 queryset=IPAddressToInterface.objects.all(), fields=("vm_interface", "ip_address")
             )
-            validator(data, self)
-        return super().validate(data)
+            validator(attrs, self)
+        return super().validate(attrs)
 
 
 #
@@ -559,17 +471,12 @@ class ServiceSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
             "device": {"help_text": "Required if no virtual_machine is specified"},
             "virtual_machine": {"help_text": "Required if no device is specified"},
         }
-        # TODO(jathan): We need to account for the "parent" field from the `ServiceTable` which is
-        # an either/or column for `device` or `virtual_machine`. For now it's hard-coded to
-        # `device`.
-        # list_display_fields = ["name", "parent", "protocol", "ports", "description"]
-        list_display_fields = ["name", "device", "protocol", "ports", "description"]
-
-    def validate(self, data):
-        if data.get("device"):
+
+    def validate(self, attrs):
+        if attrs.get("device"):
             validator = UniqueTogetherValidator(queryset=Service.objects.all(), fields=("name", "device"))
-            validator(data, self)
-        if data.get("virtual_machine"):
+            validator(attrs, self)
+        if attrs.get("virtual_machine"):
             validator = UniqueTogetherValidator(queryset=Service.objects.all(), fields=("name", "virtual_machine"))
-            validator(data, self)
-        return super().validate(data)
+            validator(attrs, self)
+        return super().validate(attrs)

nautobot/ipam/api/views.py

@@ -9,6 +9,7 @@ from rest_framework.response import Response
 from rest_framework.serializers import IntegerField, ListSerializer
 
 from nautobot.core.api.authentication import TokenPermissions
+from nautobot.core.constants import MAX_PAGE_SIZE_DEFAULT, PAGINATE_COUNT_DEFAULT
 from nautobot.core.models.querysets import count_related
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.models import Location
@@ -49,21 +50,19 @@ class NamespaceViewSet(NautobotModelViewSet):
 
 
 class VRFViewSet(NautobotModelViewSet):
-    queryset = VRF.objects.select_related("namespace", "tenant").prefetch_related(
-        "devices", "virtual_machines", "prefixes", "import_targets", "export_targets", "tags"
-    )
+    queryset = VRF.objects.all()
     serializer_class = serializers.VRFSerializer
     filterset_class = filters.VRFFilterSet
 
 
 class VRFDeviceAssignmentViewSet(NautobotModelViewSet):
-    queryset = VRFDeviceAssignment.objects.select_related("vrf", "device", "virtual_machine")
+    queryset = VRFDeviceAssignment.objects.all()
     serializer_class = serializers.VRFDeviceAssignmentSerializer
     filterset_class = filters.VRFDeviceAssignmentFilterSet
 
 
 class VRFPrefixAssignmentViewSet(NautobotModelViewSet):
-    queryset = VRFPrefixAssignment.objects.select_related("vrf", "prefix")
+    queryset = VRFPrefixAssignment.objects.all()
     serializer_class = serializers.VRFPrefixAssignmentSerializer
     filterset_class = filters.VRFPrefixAssignmentFilterSet
 
@@ -74,7 +73,7 @@ class VRFPrefixAssignmentViewSet(NautobotModelViewSet):
 
 
 class RouteTargetViewSet(NautobotModelViewSet):
-    queryset = RouteTarget.objects.select_related("tenant").prefetch_related("tags")
+    queryset = RouteTarget.objects.all()
     serializer_class = serializers.RouteTargetSerializer
     filterset_class = filters.RouteTargetFilterSet
 
@@ -109,21 +108,14 @@ class RIRViewSet(NautobotModelViewSet):
     update=extend_schema(responses={"200": serializers.PrefixLegacySerializer}, versions=["2.0", "2.1"]),
 )
 class PrefixViewSet(NautobotModelViewSet):
-    queryset = Prefix.objects.select_related(
-        "namespace",
-        "parent",
-        "rir",
-        "role",
-        "status",
-        "tenant",
-        "vlan",
-    ).prefetch_related("locations", "tags")
+    queryset = Prefix.objects.all()
     serializer_class = serializers.PrefixSerializer
     filterset_class = filters.PrefixFilterSet
 
     def get_serializer_class(self):
         if (
             not getattr(self, "swagger_fake_view", False)
+            and hasattr(self.request, "major_version")
             and self.request.major_version == 2
             and self.request.minor_version < 2
         ):
@@ -139,15 +131,15 @@ class PrefixViewSet(NautobotModelViewSet):
         )
         default_code = "precondition_failed"
 
-    def retrieve(self, request, pk=None):
+    def retrieve(self, request, *args, pk=None, **kwargs):
         try:
-            return super().retrieve(request, pk)
+            return super().retrieve(request, *args, pk=pk, **kwargs)
         except Location.MultipleObjectsReturned as e:
             raise self.LocationIncompatibleLegacyBehavior from e
 
-    def list(self, request):
+    def list(self, request, *args, **kwargs):
         try:
-            return super().list(request)
+            return super().list(request, *args, **kwargs)
         except Location.MultipleObjectsReturned as e:
             raise self.LocationIncompatibleLegacyBehavior from e
 
@@ -185,20 +177,15 @@ class PrefixViewSet(NautobotModelViewSet):
                 available_prefixes = prefix.get_available_prefixes()
 
                 # Validate Requested Prefixes' length
-                serializer = serializers.PrefixLengthSerializer(
-                    data=request.data if isinstance(request.data, list) else [request.data],
-                    many=True,
-                    context={
-                        "request": request,
-                        "prefix": prefix,
-                    },
-                )
-                serializer.is_valid(raise_exception=True)
-
-                requested_prefixes = serializer.validated_data
-                # Allocate prefixes to the requested objects based on availability within the parent
+                requested_prefixes = request.data if isinstance(request.data, list) else [request.data]
                 for requested_prefix in requested_prefixes:
-                    # Find the first available prefix equal to or larger than the requested size
+                    # If the prefix_length is not an integer, return a 400 using the
+                    # serializer.is_valid(raise_exception=True) method call below
+                    if not isinstance(requested_prefix["prefix_length"], int):
+                        return Response(
+                            {"prefix_length": "This field must be an integer."},
+                            status=status.HTTP_400_BAD_REQUEST,
+                        )
                     for available_prefix in available_prefixes.iter_cidrs():
                         if requested_prefix["prefix_length"] >= available_prefix.prefixlen:
                             allocated_prefix = f"{available_prefix.network}/{requested_prefix['prefix_length']}"
@@ -210,11 +197,6 @@ class PrefixViewSet(NautobotModelViewSet):
                             {"detail": "Insufficient space is available to accommodate the requested prefix size(s)"},
                             status=status.HTTP_204_NO_CONTENT,
                         )
-
-                    # The serializer usage above has mapped "custom_fields" dict to "_custom_field_data".
-                    # We need to convert it back to "custom_fields" as we're going to deserialize it a second time below
-                    requested_prefix["custom_fields"] = requested_prefix.pop("_custom_field_data", {})
-
                     # Remove the allocated prefix from the list of available prefixes
                     available_prefixes.remove(allocated_prefix)
 
@@ -275,17 +257,7 @@ class PrefixViewSet(NautobotModelViewSet):
                 "nautobot.ipam.api.views.available_ips", blocking_timeout=5, timeout=settings.REDIS_LOCK_TIMEOUT
             ):
                 # Normalize to a list of objects
-                serializer = serializers.IPAllocationSerializer(
-                    data=request.data if isinstance(request.data, list) else [request.data],
-                    many=True,
-                    context={
-                        "request": request,
-                        "prefix": prefix,
-                    },
-                )
-                serializer.is_valid(raise_exception=True)
-
-                requested_ips = serializer.validated_data
+                requested_ips = request.data if isinstance(request.data, list) else [request.data]
 
                 # Determine if the requested number of IPs is available
                 available_ips = prefix.get_available_ips()
@@ -306,9 +278,6 @@ class PrefixViewSet(NautobotModelViewSet):
                 for requested_ip in requested_ips:
                     requested_ip["address"] = f"{next(available_ips)}/{prefix_length}"
                     requested_ip["namespace"] = prefix.namespace
-                    # The serializer usage above has mapped "custom_fields" dict to "_custom_field_data".
-                    # We need to convert it back to "custom_fields" as we're going to deserialize it a second time below
-                    requested_ip["custom_fields"] = requested_ip.pop("_custom_field_data", {})
 
                 # Initialize the serializer with a list or a single object depending on what was requested
                 context = {"request": request, "depth": 0}
@@ -326,11 +295,15 @@ class PrefixViewSet(NautobotModelViewSet):
         # Determine the maximum number of IPs to return
         else:
             try:
-                limit = int(request.query_params.get("limit", get_settings_or_config("PAGINATE_COUNT")))
+                limit = int(
+                    request.query_params.get(
+                        "limit", get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+                    )
+                )
             except ValueError:
-                limit = get_settings_or_config("PAGINATE_COUNT")
-            if get_settings_or_config("MAX_PAGE_SIZE"):
-                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE"))
+                limit = get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+            if get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT):
+                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT))
 
             # Calculate available IPs within the prefix
             ip_list = []
@@ -351,7 +324,7 @@ class PrefixViewSet(NautobotModelViewSet):
 
 
 class PrefixLocationAssignmentViewSet(NautobotModelViewSet):
-    queryset = PrefixLocationAssignment.objects.select_related("prefix", "location")
+    queryset = PrefixLocationAssignment.objects.all()
     serializer_class = serializers.PrefixLocationAssignmentSerializer
     filterset_class = filters.PrefixLocationAssignmentFilterSet
 
@@ -362,13 +335,7 @@ class PrefixLocationAssignmentViewSet(NautobotModelViewSet):
 
 
 class IPAddressViewSet(NautobotModelViewSet):
-    queryset = IPAddress.objects.select_related(
-        "nat_inside",
-        "parent",
-        "role",
-        "status",
-        "tenant",
-    ).prefetch_related("tags", "nat_outside_list")
+    queryset = IPAddress.objects.select_related("parent__namespace")
     serializer_class = serializers.IPAddressSerializer
     filterset_class = filters.IPAddressFilterSet
 
@@ -379,7 +346,7 @@ class IPAddressViewSet(NautobotModelViewSet):
 
 
 class IPAddressToInterfaceViewSet(NautobotModelViewSet):
-    queryset = IPAddressToInterface.objects.select_related("interface", "ip_address", "vm_interface")
+    queryset = IPAddressToInterface.objects.all()
     serializer_class = serializers.IPAddressToInterfaceSerializer
     filterset_class = filters.IPAddressToInterfaceFilterSet
 
@@ -390,11 +357,7 @@ class IPAddressToInterfaceViewSet(NautobotModelViewSet):
 
 
 class VLANGroupViewSet(NautobotModelViewSet):
-    queryset = (
-        VLANGroup.objects.select_related("location")
-        .prefetch_related("tags")
-        .annotate(vlan_count=count_related(VLAN, "vlan_group"))
-    )
+    queryset = VLANGroup.objects.annotate(vlan_count=count_related(VLAN, "vlan_group"))
     serializer_class = serializers.VLANGroupSerializer
     filterset_class = filters.VLANGroupFilterSet
 
@@ -442,16 +405,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
                 "nautobot.ipam.api.views.available_vlans", blocking_timeout=5, timeout=settings.REDIS_LOCK_TIMEOUT
             ):
                 # Normalize to a list of objects
-                serializer = serializers.VLANAllocationSerializer(
-                    data=request.data if isinstance(request.data, list) else [request.data],
-                    many=True,
-                    context={
-                        "request": request,
-                        "vlan_group": vlan_group,
-                    },
-                )
-                serializer.is_valid(raise_exception=True)
-                requested_vlans = serializer.validated_data
+                requested_vlans = request.data if isinstance(request.data, list) else [request.data]
 
                 # Determine if the requested number of VLANs is available
                 available_vids = vlan_group.available_vids
@@ -487,20 +441,28 @@ class VLANGroupViewSet(NautobotModelViewSet):
                         requested_vlan["vid"] = next(_available_vids)
 
                     # Check requested `vlan_group`
-                    if "vlan_group" in requested_vlan and requested_vlan["vlan_group"] != vlan_group:
-                        return Response(
-                            {
-                                "detail": f"Invalid VLAN Group requested: {requested_vlan['vlan_group']}. "
-                                f"Only VLAN Group {vlan_group} is permitted."
-                            },
-                            status=status.HTTP_204_NO_CONTENT,
-                        )
+                    if "vlan_group" in requested_vlan:
+                        requested_vlan_group = None
+                        requested_vlan_group_pk = requested_vlan["vlan_group"]
+                        try:
+                            requested_vlan_group = VLANGroup.objects.get(pk=requested_vlan_group_pk)
+                        except VLANGroup.DoesNotExist:
+                            return Response(
+                                {"detail": f"VLAN Group with pk {requested_vlan_group_pk} does not exist."},
+                                status=status.HTTP_204_NO_CONTENT,
+                            )
+
+                        if requested_vlan_group != vlan_group:
+                            return Response(
+                                {
+                                    "detail": f"Invalid VLAN Group requested: {requested_vlan_group}. "
+                                    f"Only VLAN Group {vlan_group} is permitted."
+                                },
+                                status=status.HTTP_204_NO_CONTENT,
+                            )
                     else:
                         requested_vlan["vlan_group"] = vlan_group.pk
 
-                    # Rewrite custom field data
-                    requested_vlan["custom_fields"] = requested_vlan.pop("_custom_field_data", {})
-
                 # Initialize the serializer with a list or a single object depending on what was requested
                 context = {"request": request, "depth": 0}
 
@@ -527,12 +489,16 @@ class VLANGroupViewSet(NautobotModelViewSet):
 
         else:
             try:
-                limit = int(request.query_params.get("limit", get_settings_or_config("PAGINATE_COUNT")))
+                limit = int(
+                    request.query_params.get(
+                        "limit", get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
+                    )
+                )
             except ValueError:
-                limit = get_settings_or_config("PAGINATE_COUNT")
+                limit = get_settings_or_config("PAGINATE_COUNT", fallback=PAGINATE_COUNT_DEFAULT)
 
-            if get_settings_or_config("MAX_PAGE_SIZE"):
-                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE"))
+            if get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT):
+                limit = min(limit, get_settings_or_config("MAX_PAGE_SIZE", fallback=MAX_PAGE_SIZE_DEFAULT))
 
             if isinstance(limit, int) and limit >= 0:
                 vids = vlan_group.available_vids[0:limit]
@@ -573,16 +539,7 @@ class VLANGroupViewSet(NautobotModelViewSet):
     update=extend_schema(responses={"200": serializers.VLANLegacySerializer}, versions=["2.0", "2.1"]),
 )
 class VLANViewSet(NautobotModelViewSet):
-    queryset = (
-        VLAN.objects.select_related(
-            "vlan_group",
-            "status",
-            "role",
-            "tenant",
-        )
-        .prefetch_related("tags")
-        .annotate(prefix_count=count_related(Prefix, "vlan"))
-    )
+    queryset = VLAN.objects.annotate(prefix_count=count_related(Prefix, "vlan"))
     serializer_class = serializers.VLANSerializer
     filterset_class = filters.VLANFilterSet
 
@@ -597,6 +554,7 @@ class VLANViewSet(NautobotModelViewSet):
     def get_serializer_class(self):
         if (
             not getattr(self, "swagger_fake_view", False)
+            and hasattr(self.request, "major_version")
             and self.request.major_version == 2
             and self.request.minor_version < 2
         ):
@@ -604,15 +562,15 @@ class VLANViewSet(NautobotModelViewSet):
             return serializers.VLANLegacySerializer
         return super().get_serializer_class()
 
-    def retrieve(self, request, pk=None):
+    def retrieve(self, request, *args, pk=None, **kwargs):
         try:
-            return super().retrieve(request, pk)
+            return super().retrieve(request, *args, pk=pk, **kwargs)
         except Location.MultipleObjectsReturned as e:
             raise self.LocationIncompatibleLegacyBehavior from e
 
-    def list(self, request):
+    def list(self, request, *args, **kwargs):
         try:
-            return super().list(request)
+            return super().list(request, *args, **kwargs)
         except Location.MultipleObjectsReturned as e:
             raise self.LocationIncompatibleLegacyBehavior from e
 
@@ -624,7 +582,7 @@ class VLANViewSet(NautobotModelViewSet):
 
 
 class VLANLocationAssignmentViewSet(NautobotModelViewSet):
-    queryset = VLANLocationAssignment.objects.select_related("vlan", "location")
+    queryset = VLANLocationAssignment.objects.all()
     serializer_class = serializers.VLANLocationAssignmentSerializer
     filterset_class = filters.VLANLocationAssignmentFilterSet
 
@@ -635,6 +593,6 @@ class VLANLocationAssignmentViewSet(NautobotModelViewSet):
 
 
 class ServiceViewSet(NautobotModelViewSet):
-    queryset = Service.objects.select_related("device", "virtual_machine").prefetch_related("tags", "ip_addresses")
+    queryset = Service.objects.all()
     serializer_class = serializers.ServiceSerializer
     filterset_class = filters.ServiceFilterSet

nautobot/ipam/factory.py

@@ -410,7 +410,7 @@ class PrefixFactory(PrimaryModelFactory):
             # Calculate prefix length for child prefixes to allow them to fit in the parent prefix without creating duplicate prefix
             child_cidr = self.prefix_length + max(1, math.ceil(math.log(child_count, 2)))
             # Raise exception for invalid cidr length (>128 for ipv6, >32 for ipv4)
-            if child_cidr > 128 or self.ip_version == 4 and child_cidr > 32:
+            if child_cidr > 128 or (self.ip_version == 4 and child_cidr > 32):
                 raise ValueError(f"Unable to create {child_count} child prefixes in container prefix {self.cidr_str}.")
 
             weights = [1, 6, 3]  # prefer network and pool prefixes