nautobot 2.4.3__py3-none-any.whl → 2.4.4__py3-none-any.whl

nautobot/apps/filters.py

@@ -43,6 +43,7 @@ from nautobot.extras.filters.mixins import (
     StatusFilter,
 )
 from nautobot.extras.plugins import FilterExtension
+from nautobot.ipam.filters import PrefixFilter
 from nautobot.tenancy.filters import TenancyModelFilterSetMixin
 
 __all__ = (
@@ -72,6 +73,7 @@ __all__ = (
     "NaturalKeyOrPKMultipleChoiceFilter",
     "NautobotFilterSet",
     "NumericArrayFilter",
+    "PrefixFilter",
     "RelatedMembershipBooleanFilter",
     "RelationshipFilter",
     "RelationshipModelFilterSetMixin",

nautobot/circuits/filters.py

@@ -16,7 +16,7 @@ from nautobot.dcim.filters import (
 )
 from nautobot.dcim.models import Location
 from nautobot.extras.filters import NautobotFilterSet, StatusModelFilterSetMixin
-from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
 
 from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 

nautobot/circuits/tests/test_models.py

@@ -17,8 +17,7 @@ class CircuitTerminationModelTestCase(ModelTestCases.BaseModelTestCase):
         provider = Provider.objects.first()
         circuit_type = CircuitType.objects.first()
 
-        location_type_1 = LocationType.objects.get(name="Campus")
-        location_type_1.content_types.set([])
+        location_type_1 = LocationType.objects.create(name="University")
         location_type_2 = LocationType.objects.get(name="Building")
         location_type_2.content_types.add(ContentType.objects.get_for_model(CircuitTermination))
         status = Status.objects.get_for_model(Circuit).first()
@@ -26,7 +25,10 @@ class CircuitTerminationModelTestCase(ModelTestCases.BaseModelTestCase):
             cid="Circuit 1", provider=provider, circuit_type=circuit_type, status=status
         )
         cls.provider_network = ProviderNetwork.objects.create(name="Provider Network 1", provider=provider)
-        cls.location_1 = Location.objects.filter(location_type=location_type_1)[0]
+        location_status = Status.objects.get_for_model(Location).first()
+        cls.location_1 = Location.objects.create(
+            name="Department", location_type=location_type_1, status=location_status
+        )
         cls.location_2 = Location.objects.filter(location_type=location_type_2)[0]
 
         cloud_resource_type = CloudResourceType.objects.get_for_model(CloudNetwork).first()

nautobot/cloud/filters.py

@@ -1,5 +1,3 @@
-import django_filters
-
 from nautobot.cloud import models
 from nautobot.core.filters import (
     BaseFilterSet,
@@ -11,7 +9,7 @@ from nautobot.dcim.models import Manufacturer
 from nautobot.extras.filters import NautobotFilterSet
 from nautobot.extras.models import SecretsGroup
 from nautobot.extras.utils import FeatureQuery
-from nautobot.ipam.models import Prefix
+from nautobot.ipam.filters import PrefixFilter
 
 
 class CloudAccountFilterSet(NautobotFilterSet):
@@ -98,7 +96,7 @@ class CloudNetworkFilterSet(NautobotFilterSet):
         queryset=models.CloudNetwork.objects.all(),
         label="Parent cloud network (name or ID)",
     )
-    prefixes = django_filters.ModelMultipleChoiceFilter(queryset=Prefix.objects.all())
+    prefixes = PrefixFilter()
 
     class Meta:
         model = models.CloudNetwork
@@ -117,8 +115,7 @@ class CloudNetworkPrefixAssignmentFilterSet(BaseFilterSet):
         queryset=models.CloudNetwork.objects.all(),
         label="Cloud network (name or ID)",
     )
-    # Prefix doesn't have an appropriate natural key for NaturalKeyOrPKMultipleChoiceFilter
-    prefix = django_filters.ModelMultipleChoiceFilter(queryset=Prefix.objects.all())
+    prefix = PrefixFilter()
 
     class Meta:
         model = models.CloudNetworkPrefixAssignment

nautobot/cloud/tests/test_filters.py

@@ -65,6 +65,7 @@ class CloudNetworkTestCase(FilterTestCases.FilterTestCase):
         ("name",),
         ("parent", "parent__id"),
         ("parent", "parent__name"),
+        ("prefixes", "prefixes__id"),
     ]
     exclude_q_filter_predicates = [
         "parent__name",
@@ -79,6 +80,16 @@ class CloudNetworkTestCase(FilterTestCases.FilterTestCase):
             queryset = queryset.filter(children__isnull=True)
         return queryset
 
+    def test_prefixes_filter_by_string(self):
+        """Test filtering by prefix strings as an alternative to pk."""
+        prefix = self.queryset.filter(prefixes__isnull=False).first().prefixes.first()
+        params = {"prefixes": [prefix.prefix]}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs,
+            self.queryset.filter(prefixes__network=prefix.network, prefixes__prefix_length=prefix.prefix_length),
+            ordered=False,
+        )
+
 
 class CloudNetworkPrefixAssignmentTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudNetworkPrefixAssignment.objects.all()
@@ -89,6 +100,16 @@ class CloudNetworkPrefixAssignmentTestCase(FilterTestCases.FilterTestCase):
         ("prefix", "prefix__id"),
     ]
 
+    def test_prefix_filter_by_string(self):
+        """Test filtering by prefix strings as an alternative to pk."""
+        prefix = self.queryset.first().prefix
+        params = {"prefix": [prefix.prefix]}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs,
+            self.queryset.filter(prefix__network=prefix.network, prefix__prefix_length=prefix.prefix_length),
+            ordered=False,
+        )
+
 
 class CloudServiceNetworkAssignmentTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudServiceNetworkAssignment.objects.all()

nautobot/core/admin.py

@@ -9,7 +9,9 @@ from django_celery_beat.models import (
     PeriodicTask,
     SolarSchedule,
 )
+import social_django.admin  # noqa: F401  # unused-import -- but this import installs the social_django admin
 from social_django.models import Association, Nonce, UserSocialAuth
+import taggit.admin  # noqa: F401  # unused-import -- but this import installs the taggit admin
 from taggit.models import Tag
 
 from nautobot.core.forms import BootstrapMixin

nautobot/core/jobs/__init__.py

@@ -229,7 +229,8 @@ class ExportObjectList(Job):
             # The force_csv=True attribute is a hack, but much easier than trying to construct a valid HttpRequest
             # object from scratch that passes all implicit and explicit assumptions in Django and DRF.
             serializer = serializer_class(queryset, many=True, context={"request": None}, force_csv=True)
-            csv_data = renderer.render(serializer.data)
+            # Explicitly add UTF-8 BOM to the data so that Excel will understand non-ASCII characters correctly...
+            csv_data = codecs.BOM_UTF8 + renderer.render(serializer.data).encode("utf-8")
             self.create_file(filename + ".csv", csv_data)
 
 

nautobot/core/management/commands/generate_performance_test_endpoints.py

@@ -1,5 +1,6 @@
 from typing import Optional
 
+from django.apps import apps
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.urls import get_resolver
@@ -162,6 +163,10 @@ class Command(BaseCommand):
         if model:
             app_name = model._meta.app_label
 
+        # Retrieve the base URL for the app to be used in the URL pattern
+        app_config = apps.get_app_config(app_name)
+        base_url = app_config.base_url if hasattr(app_config, "base_url") else app_name
+
         if app_name == "users" and pattern.name in ["login", "logout"]:
             # No need to test the login and logout endpoints for performance testing
             url_pattern = f"/{pattern.pattern}"  # /login, /logout
@@ -199,7 +204,7 @@ class Command(BaseCommand):
         elif is_api_endpoint:
             if not is_app:
                 # One of the nautobot apps: nautobot.circuits, nautobot.dcim, and etc.
-                url_pattern = f"/api/{app_name}/{pattern.pattern}"  # /api/dcim/devices/
+                url_pattern = f"/api/{base_url}/{pattern.pattern}"  # /api/dcim/devices/
                 app_name = f"{app_name}-api"  # dcim-api
                 view_name = f"{app_name}:{pattern.name}"  # dcim-api:device-list
             else:
@@ -207,16 +212,14 @@ class Command(BaseCommand):
                 view_name = (
                     f"plugins-api:{api_app_name}:{pattern.name}"  # plugins-api:example_app-api:examplemodel-list
                 )
-                app_name = app_name.replace("_", "-")  # example_app -> example-app
-                url_pattern = f"/api/plugins/{app_name}/{pattern.pattern}"  # /api/plugins/example-app/models/
+                url_pattern = f"/api/plugins/{base_url}/{pattern.pattern}"  # /api/plugins/example-app/models/
         else:
             if not is_app:
-                url_pattern = f"/{app_name}/{pattern.pattern}"  # /dcim/devices/
+                url_pattern = f"/{base_url}/{pattern.pattern}"  # /dcim/devices/
                 view_name = f"{app_name}:{pattern.name}"  # dcim:device_list
             else:
                 view_name = f"plugins:{app_name}:{pattern.name}"  # plugins:example_app:examplemodel_list
-                app_name = app_name.replace("_", "-")  # example_app -> example-app
-                url_pattern = f"/plugins/{app_name}/{pattern.pattern}"  # /plugins/example-app/models/
+                url_pattern = f"/plugins/{base_url}/{pattern.pattern}"  # /plugins/example-app/models/
 
         return url_pattern, view_name, is_api_endpoint
 

nautobot/core/models/utils.py

@@ -112,7 +112,12 @@ def serialize_object(obj, extra=None, exclude=None):
 
     # Include any tags. Check for tags cached on the instance; fall back to using the manager.
     if is_taggable(obj):
-        tags = getattr(obj, "_tags", []) or obj.tags.all()
+        # Note that when upgrading from Nautobot 1.x to 2.0, this method may be called during data migrations,
+        # specifically ipam_0022 and dcim_0034, to create ObjectChange records.
+        # This can be problematic (see issue #6952) as the Tag records in the DB still have `created` as a `DateField`,
+        # but the 2.x code expects this to be a `DateTimeField` (as it will be after the upgrade completes in full).
+        # We "cleverly" bypass that issue by using `.only("name")` since that's the only actual Tag field we need here.
+        tags = getattr(obj, "_tags", []) or obj.tags.only("name")
         data["tags"] = [tag.name for tag in tags]
 
     # Append any extra data

nautobot/core/templates/inc/javascript.html

@@ -27,6 +27,7 @@
 <script src="{% versioned_static 'js/dropdown.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=js/dropdown.js'"></script>
 <script type="text/javascript">
+    var nautobot_static_url = "{% static '' %}";
     var nautobot_api_path = "{% url 'api-root' %}";
     var nautobot_csrf_token = "{{ csrf_token }}";
     var loading = $(".loading");

nautobot/core/templatetags/ui_framework.py

@@ -1,9 +1,13 @@
+import logging
+
 from django import template
 from django.utils.html import format_html_join
 
 from nautobot.core.utils.lookup import get_view_for_model
 from nautobot.core.views.utils import get_obj_from_context
 
+logger = logging.getLogger(__name__)
+
 register = template.Library()
 
 
@@ -26,15 +30,27 @@ def render_components(context, components):
 @register.simple_tag(takes_context=True)
 def render_detail_view_extra_buttons(context):
     """
-    Render the "extra_buttons" if any from the base detail view associated with the context object.
+    Render the "extra_buttons" from the context's object_detail_content, or as fallback, from the base detail view.
 
     This makes it possible for "extra" tabs (such as Changelog and Notes, and any added by App TemplateExtensions)
     to automatically still render any `extra_buttons` defined by the base detail view, without the tab-specific views
     needing to explicitly inherit from the base view.
     """
-    obj = get_obj_from_context(context)
-    base_detail_view = get_view_for_model(obj)
-    object_detail_content = getattr(base_detail_view, "object_detail_content", None)
+    object_detail_content = context.get("object_detail_content")
+    if object_detail_content is None:
+        obj = get_obj_from_context(context)
+        if obj is None:
+            logger.error("No 'obj' or 'object' found in the render context!")
+            return ""
+        base_detail_view = get_view_for_model(obj)
+        if base_detail_view is None:
+            logger.warning(
+                "Unable to identify the base detail view - check that it has a valid name, i.e. %sUIViewSet or %sView",
+                type(obj).__name__,
+                type(obj).__name__,
+            )
+            return ""
+        object_detail_content = getattr(base_detail_view, "object_detail_content", None)
     if object_detail_content is not None and object_detail_content.extra_buttons:
         return render_components(context, object_detail_content.extra_buttons)
     return ""

nautobot/core/testing/forms.py

@@ -24,7 +24,7 @@ class FormTestCases:
                         self.skipTest(f"{self.form_class.__name__}.{field_name} has no query_params")
                     field_model = field_class.queryset.model
                     filterset_class = get_filterset_for_model(field_model)
-                    filterset_fields = set(filterset_class.declared_filters.keys())
+                    filterset_fields = set(filterset_class.get_filters().keys())
                     invalid_query_params = query_params_fields - filterset_fields
                     self.assertFalse(
                         invalid_query_params,

nautobot/core/tests/test_api.py

@@ -609,7 +609,7 @@ class WritableNestedSerializerTest(testing.APITestCase):
             dcim_models.LocationType.objects.get(name="Building"),
         ]
         for location_type in self.locations_types:
-            location_type.content_types.set([vlan_group_ct, vlan_ct])
+            location_type.content_types.add(vlan_group_ct, vlan_ct)
 
         self.statuses = extras_models.Status.objects.get_for_model(dcim_models.Location)
         self.location1 = dcim_models.Location.objects.create(

nautobot/core/tests/test_graphql.py

@@ -8,7 +8,7 @@ from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q
+from django.db.models import Count, Q
 from django.test import override_settings, TestCase
 from django.test.client import RequestFactory
 from django.urls import reverse
@@ -919,8 +919,8 @@ class GraphQLQueryTest(GraphQLTestCaseBase):
                 priority=789,
             ),
         )
-        prefixes = Prefix.objects.all()[:2]
-        cls.namespace = prefixes[0].namespace
+        cls.namespace = Namespace.objects.annotate(prefix_count=Count("prefixes")).filter(prefix_count__gt=2).first()
+        prefixes = Prefix.objects.filter(namespace=cls.namespace)
         vrfs = (
             VRF.objects.create(name="VRF 1", rd="65000:100", namespace=cls.namespace),
             VRF.objects.create(name="VRF 2", rd="65000:200", namespace=cls.namespace),

nautobot/core/tests/test_jobs.py

@@ -1,3 +1,4 @@
+import codecs
 from datetime import timedelta
 import json
 from pathlib import Path
@@ -72,7 +73,9 @@ class ExportObjectListTest(TransactionTestCase):
         self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
         self.assertTrue(job_result.files.exists())
         self.assertEqual(Path(job_result.files.first().file.name).name, "nautobot_statuses.csv")
-        csv_data = job_result.files.first().file.read().decode("utf-8")
+        csv_bytes = job_result.files.first().file.read()
+        self.assertTrue(csv_bytes.startswith(codecs.BOM_UTF8), csv_bytes)
+        csv_data = csv_bytes.decode("utf-8")
         self.assertIn(str(instance1.pk), csv_data)
         self.assertNotIn(str(instance2.pk), csv_data)
 

nautobot/core/ui/object_detail.py

@@ -1372,7 +1372,7 @@ class StatsPanel(Panel):
                 value = [related_object_list_url, related_object_count, related_object_title]
                 stats[related_object_model_class] = value
                 related_object_model_filterset = get_filterset_for_model(related_object_model_class)
-                if self.filter_name not in related_object_model_filterset.declared_filters:
+                if self.filter_name not in related_object_model_filterset.get_filters():
                     raise FieldDoesNotExist(
                         f"{self.filter_name} is not a valid filter field for {related_object_model_class_meta.verbose_name}"
                     )

nautobot/dcim/api/serializers.py

@@ -1,6 +1,7 @@
 import contextlib
 
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ValidationError
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator, UniqueValidator
@@ -560,11 +561,46 @@ class DeviceSerializer(TaggedModelSerializerMixin, NautobotModelSerializer):
             )
             validator(attrs, self)
 
+        # Validate parent bay
+        if parent_bay := attrs.get("parent_bay", None):
+            if parent_bay.installed_device and parent_bay.installed_device != self.instance:
+                raise ValidationError(
+                    {
+                        "installed_device": f"Cannot install device; parent bay is already taken ({parent_bay.installed_device})"
+                    }
+                )
+
+            if self.instance:
+                parent_bay.installed_device = self.instance
+                parent_bay.full_clean()
+
         # Enforce model validation
         super().validate(attrs)
 
         return attrs
 
+    def create(self, validated_data):
+        instance = super().create(validated_data)
+        self.update_parent_bay(validated_data, instance)
+        return instance
+
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        self.update_parent_bay(validated_data, instance)
+        return instance
+
+    def update_parent_bay(self, validated_data, instance):
+        update_parent_bay = "parent_bay" in validated_data.keys()
+        parent_bay = validated_data.get("parent_bay")
+        if update_parent_bay:
+            if parent_bay:
+                parent_bay.installed_device = instance
+                parent_bay.save()
+            elif hasattr(instance, "parent_bay"):
+                parent_bay = instance.parent_bay
+                parent_bay.installed_device = None
+                parent_bay.validated_save()
+
 
 class DeviceNAPALMSerializer(serializers.Serializer):
     method = serializers.DictField()

nautobot/dcim/api/views.py

@@ -183,7 +183,7 @@ class RackGroupViewSet(NautobotModelViewSet):
 
 
 class RackViewSet(NautobotModelViewSet):
-    queryset = Rack.objects.select_related("rack_group__location").annotate(
+    queryset = Rack.objects.select_related("role", "status", "rack_group__location").annotate(
         device_count=count_related(Device, "rack"),
         power_feed_count=count_related(PowerFeed, "rack"),
     )

nautobot/dcim/elevations.py

@@ -96,17 +96,30 @@ class RackElevationSVG:
         device_fullname = str(device) + device_bay_details
         device_shortname = settings.UI_RACK_VIEW_TRUNCATE_FUNCTION(str(device)) + device_bay_details
 
-        color = device.role.color
-        reverse_url = reverse("dcim:device", kwargs={"pk": device.pk})
+        role_color = device.role.color
+        status_color = device.status.color
+        device_reverse_url = reverse("dcim:device", kwargs={"pk": device.pk})
+        status_reverse_url = reverse("extras:status", kwargs={"pk": device.status.pk})
         link = drawing.add(
             drawing.a(
-                href=f"{self.base_url}{reverse_url}",
+                href=f"{self.base_url}{device_reverse_url}",
                 target="_top",
                 fill="black",
             )
         )
         link.set_desc(self._get_device_description(device))
-        link.add(drawing.rect(start, end, style=f"fill: #{color}", class_="slot"))
+        link.add(drawing.rect(start, end, style=f"fill: #{role_color}", class_="slot"))
+
+        status_rect = drawing.add(
+            drawing.a(
+                href=f"{self.base_url}{status_reverse_url}",
+                target="_top",
+                fill="black",
+            )
+        )
+        status_rect.set_desc(device.status.name)
+        status_end = (end[0] / 20, end[1])  # width, y
+        status_rect.add(drawing.rect(start, status_end, style=f"fill: #{status_color}"))
 
         # Embed front device type image if one exists
         if self.include_images and device.device_type.front_image:

nautobot/dcim/factory.py

@@ -64,7 +64,7 @@ from nautobot.dcim.models import (
 )
 from nautobot.extras.models import ExternalIntegration, Role, Status
 from nautobot.extras.utils import FeatureQuery
-from nautobot.ipam.models import Prefix, VLAN, VLANGroup
+from nautobot.ipam.models import Prefix, VLAN, VLANGroup, VRF
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster
 
@@ -1008,3 +1008,11 @@ class VirtualDeviceContextFactory(PrimaryModelFactory):
                 self.interfaces.set(extracted)
             else:
                 self.interfaces.set(get_random_instances(Interface.objects.filter(device=self.device)))
+
+    @factory.post_generation
+    def vrfs(self, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                self.vrfs.set(extracted)
+            else:
+                self.vrfs.set(get_random_instances(VRF.objects.all()))

nautobot/dcim/filters/__init__.py

@@ -101,7 +101,7 @@ from nautobot.extras.filters import (
 from nautobot.extras.models import ExternalIntegration, SecretsGroup
 from nautobot.extras.utils import FeatureQuery
 from nautobot.ipam.models import IPAddress, VLAN, VLANGroup
-from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster, VirtualMachine
 from nautobot.wireless.models import RadioProfile, WirelessNetwork
@@ -362,6 +362,12 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
         to_field_name="name",
         label="Parent (name or ID)",
     )
+    ancestors = NaturalKeyOrPKMultipleChoiceFilter(
+        queryset=Location.objects.all(),
+        to_field_name="name",
+        label="Location(s) and ancestors thereof (name or ID)",
+        method="_ancestors",
+    )
     children = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=RackGroup.objects.all(),
         to_field_name="name",
@@ -392,6 +398,26 @@ class RackGroupFilterSet(LocatableModelFilterSetMixin, NautobotFilterSet, NameSe
         model = RackGroup
         fields = ["id", "name", "description", "racks"]
 
+    def generate_query__ancestors(self, value):
+        """Helper method used by _ancestors() method."""
+        if value:
+            locations = Location.objects.filter(pk__in=[v.pk for v in value])
+            pk_list = []
+            for location in locations:
+                parent_locations = location.ancestors(include_self=True)
+                pk_list.extend([v.pk for v in parent_locations])
+            params = Q(location__pk__in=pk_list)
+            return params
+        return Q()
+
+    @extend_schema_field({"type": "string"})
+    def _ancestors(self, queryset, name, value):
+        """FilterSet method for, given a location, getting RackGroups that exist with in the parent Location(s) and the location itself."""
+        if value:
+            params = self.generate_query__ancestors(value)
+            return queryset.filter(params)
+        return queryset
+
 
 class RackFilterSet(
     NautobotFilterSet,

nautobot/dcim/forms.py

@@ -510,7 +510,7 @@ class RackForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm):
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
         required=False,
-        query_params={"location": "$location"},
+        query_params={"ancestors": "$location"},
     )
     comments = CommentField()
 
@@ -5298,6 +5298,11 @@ class VirtualDeviceContextForm(NautobotModelForm):
         required=True,
         query_params={"content_types": VirtualDeviceContext._meta.label_lower},
     )
+    vrfs = DynamicModelMultipleChoiceField(
+        queryset=VRF.objects.all(),
+        required=False,
+        label="VRFs",
+    )
 
     class Meta:
         model = VirtualDeviceContext
@@ -5308,6 +5313,7 @@ class VirtualDeviceContextForm(NautobotModelForm):
             "status",
             "identifier",
             "interfaces",
+            "vrfs",
             "primary_ip4",
             "primary_ip6",
             "tenant",
@@ -5323,11 +5329,15 @@ class VirtualDeviceContextForm(NautobotModelForm):
             self.fields["device"].disabled = True
             self.fields["device"].required = False
 
+        self.initial["vrfs"] = self.instance.vrfs.values_list("id", flat=True)
+
     def save(self, commit=True):
         instance = super().save(commit)
         if commit:
             interfaces = self.cleaned_data["interfaces"]
             instance.interfaces.set(interfaces)
+            vrfs = self.cleaned_data["vrfs"]
+            instance.vrfs.set(vrfs)
         return instance
 
 
@@ -5345,6 +5355,8 @@ class VirtualDeviceContextBulkEditForm(
     remove_interfaces = DynamicModelMultipleChoiceField(
         queryset=Interface.objects.all(), required=False, query_params={"device": "$device"}
     )
+    add_vrfs = DynamicModelMultipleChoiceField(queryset=VRF.objects.all(), required=False)
+    remove_vrfs = DynamicModelMultipleChoiceField(queryset=VRF.objects.all(), required=False)
 
     class Meta:
         model = VirtualDeviceContext

nautobot/dcim/models/devices.py

@@ -670,11 +670,17 @@ class Device(PrimaryModel, ConfigContextModel):
 
         # Validate location
         if self.location is not None:
-            # TODO: after Location model replaced Site, which was not a hierarchical model, should we allow users to assign a Rack belongs to
-            # the parent Location or the child location of `self.location`?
-
-            if self.rack is not None and self.rack.location != self.location:
-                raise ValidationError({"rack": f'Rack "{self.rack}" does not belong to location "{self.location}".'})
+            if self.rack is not None:
+                device_location = self.location
+                # Rack's location must be a child location or the same location as that of the parent device.
+                # Location is a required field on rack.
+                rack_location = self.rack.location
+                if device_location not in rack_location.ancestors(include_self=True):
+                    raise ValidationError(
+                        {
+                            "rack": f'Rack "{self.rack}" does not belong to location "{self.location}" and its descendants.'
+                        }
+                    )
 
             # self.cluster is validated somewhat later, see below
 

nautobot/dcim/signals.py

@@ -16,6 +16,7 @@ from .models import (
     DeviceRedundancyGroup,
     Interface,
     InterfaceVDCAssignment,
+    LocationType,
     PathEndpoint,
     PowerPanel,
     Rack,
@@ -355,3 +356,28 @@ def handle_controller_managed_device_group_controller_change(instance, raw=False
             group.controller = instance.controller
             group.save()
             logger.debug("Updated controller from parent %s for child %s", instance, group)
+
+
+@receiver(m2m_changed, sender=LocationType.content_types.through)
+def content_type_changed(instance, action, **kwargs):
+    """
+    Prevents removal of a ContentType from LocationType if it's in use by any models
+    associated with the locations.
+    """
+
+    if action != "pre_remove":
+        return
+
+    removed_content_types = ContentType.objects.filter(pk__in=kwargs.get("pk_set", []))
+
+    for content_type in removed_content_types:
+        model_class = content_type.model_class()
+
+        if model_class.objects.filter(location__location_type=instance).exists():
+            raise ValidationError(
+                {
+                    "content_types": (
+                        f"Cannot remove the content type {content_type} as currently at least one {model_class._meta.verbose_name} is associated to a location of this location type. "
+                    )
+                }
+            )