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

nautobot/core/tests/test_jobs.py

@@ -1,3 +1,4 @@
+import codecs
 from datetime import timedelta
 import json
 from pathlib import Path
@@ -47,7 +48,7 @@ class ExportObjectListTest(TransactionTestCase):
             username=self.user.username,  # otherwise run_job_for_testing defaults to a superuser account
             content_type=ContentType.objects.get_for_model(Status).pk,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         log_error = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(log_error.message, f'User "{self.user}" does not have permission to view status objects')
         self.assertFalse(job_result.files.exists())
@@ -69,10 +70,12 @@ class ExportObjectListTest(TransactionTestCase):
             username=self.user.username,  # otherwise run_job_for_testing defaults to a superuser account
             content_type=ContentType.objects.get_for_model(Status).pk,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         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)
 
@@ -83,7 +86,7 @@ class ExportObjectListTest(TransactionTestCase):
             "ExportObjectList",
             content_type=ContentType.objects.get_for_model(Status).pk,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         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")
@@ -104,7 +107,7 @@ class ExportObjectListTest(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Status).pk,
             export_template=et.pk,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertTrue(job_result.files.exists())
         self.assertEqual(Path(job_result.files.first().file.name).name, "nautobot_statuses.txt")
         text_data = job_result.files.first().file.read().decode("utf-8")
@@ -126,7 +129,7 @@ class ExportObjectListTest(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(DeviceType).pk,
             export_format="yaml",
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertTrue(job_result.files.exists())
         self.assertEqual(Path(job_result.files.first().file.name).name, "nautobot_device_types.yaml")
         yaml_data = job_result.files.first().file.read().decode("utf-8")
@@ -156,7 +159,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Status).pk,
             csv_data=self.csv_data,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         log_error = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(log_error.message, f'User "{self.user}" does not have permission to create status objects')
         self.assertFalse(Status.objects.filter(name__startswith="test_status").exists())
@@ -169,7 +172,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             username=self.user.username,  # otherwise run_job_for_testing defaults to a superuser account
             content_type=ContentType.objects.get_for_model(Status).pk,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
 
     def test_csv_import_with_constrained_permission(self):
         """Job should only allow the user to import objects they have permission to add."""
@@ -188,7 +191,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Status).pk,
             csv_data=self.csv_data,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         log_successes = JobLogEntry.objects.filter(
             job_result=job_result, log_level=LogLevelChoices.LOG_INFO, message__icontains="created"
         )
@@ -217,7 +220,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Status).pk,
             csv_data=self.csv_data,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertFalse(
             JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
         )
@@ -243,7 +246,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Prefix).pk,
             csv_file=csv_file.id,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertFalse(
             JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
         )
@@ -284,7 +287,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Device).pk,
             csv_file=csv_file.id,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertFalse(
             JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
         )
@@ -310,7 +313,7 @@ class ImportObjectsTestCase(TransactionTestCase):
                 csv_data=csv_data,
                 roll_back_if_error=True,
             )
-            self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+            self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
             log_info = JobLogEntry.objects.filter(
                 job_result=job_result, log_level=LogLevelChoices.LOG_INFO, message__icontains="created"
             )
@@ -332,7 +335,7 @@ class ImportObjectsTestCase(TransactionTestCase):
                 content_type=ContentType.objects.get_for_model(Status).pk,
                 csv_data=csv_data,
             )
-            self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+            self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
             log_errors = JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
             self.assertEqual(log_errors[0].message, "Row 1: `color`: `Enter a valid hexadecimal RGB color code.`")
             self.assertFalse(Status.objects.filter(name="test_status0").exists())
@@ -372,7 +375,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(LocationType).pk,
             csv_data=location_types_csv,
         )
-        self.assertEqual(location_types_job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(location_types_job_result)
 
         location_type_count = LocationType.objects.filter(name="ContactAssignmentImportTestLocationType").count()
         self.assertEqual(location_type_count, 1, f"Unexpected count of LocationTypes {location_type_count}")
@@ -383,7 +386,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Location).pk,
             csv_data=locations_csv,
         )
-        self.assertEqual(locations_job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(locations_job_result)
 
         location_count = Location.objects.filter(location_type__name="ContactAssignmentImportTestLocationType").count()
         self.assertEqual(location_count, 2, f"Unexpected count of Locations {location_count}")
@@ -394,7 +397,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Contact).pk,
             csv_data=contacts_csv,
         )
-        self.assertEqual(contacts_job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(contacts_job_result)
 
         contact_count = Contact.objects.filter(name="Bob-ContactAssignmentImportTestLocation").count()
         self.assertEqual(contact_count, 1, f"Unexpected number of contacts {contact_count}")
@@ -405,7 +408,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(Role).pk,
             csv_data=roles_csv,
         )
-        self.assertEqual(roles_job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(roles_job_result)
 
         role_count = Role.objects.filter(name="ContactAssignmentImportTestLocation-On Site").count()
         self.assertEqual(role_count, 1, f"Unexpected number of role values {role_count}")
@@ -423,8 +426,7 @@ class ImportObjectsTestCase(TransactionTestCase):
             content_type=ContentType.objects.get_for_model(ContactAssociation).pk,
             csv_data=associations_csv,
         )
-
-        self.assertEqual(associations_job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(associations_job_result)
 
 
 class LogsCleanupTestCase(TransactionTestCase):
@@ -466,7 +468,7 @@ class LogsCleanupTestCase(TransactionTestCase):
             cleanup_types=[CleanupTypes.JOB_RESULT],
             max_age=0,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         log_error = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(log_error.message, f'User "{self.user}" does not have permission to delete JobResult records')
         self.assertEqual(JobResult.objects.count(), job_result_count + 1)
@@ -481,7 +483,7 @@ class LogsCleanupTestCase(TransactionTestCase):
                 cleanup_types=[CleanupTypes.OBJECT_CHANGE],
                 max_age=0,
             )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         log_error = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(
             log_error.message, f'User "{self.user}" does not have permission to delete ObjectChange records'
@@ -529,7 +531,7 @@ class LogsCleanupTestCase(TransactionTestCase):
             cleanup_types=[CleanupTypes.JOB_RESULT, CleanupTypes.OBJECT_CHANGE],
             max_age=0,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertEqual(job_result.result["extras.JobResult"], 1)
         self.assertEqual(job_result.result["extras.ObjectChange"], 1)
         with self.assertRaises(JobResult.DoesNotExist):
@@ -626,7 +628,7 @@ class BulkEditTestCase(TransactionTestCase):
             tag.content_types.add(self.namespace_ct)
 
     def _common_no_error_test_assertion(self, model, job_result, expected_count, **filter_params):
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertEqual(model.objects.filter(**filter_params).count(), expected_count)
         self.assertFalse(
             JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
@@ -647,7 +649,7 @@ class BulkEditTestCase(TransactionTestCase):
             form_data={"pk": pk_list, "color": "aa1409"},
             username=self.user.username,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         job_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(job_log.message, f'User "{self.user}" does not have permission to update status objects')
 
@@ -958,7 +960,7 @@ class BulkDeleteTestCase(TransactionTestCase):
         )
 
     def _common_no_error_test_assertion(self, model, job_result, **filter_params):
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_SUCCESS)
+        self.assertJobResultStatus(job_result)
         self.assertEqual(model.objects.filter(**filter_params).count(), 0)
         self.assertFalse(
             JobLogEntry.objects.filter(job_result=job_result, log_level=LogLevelChoices.LOG_WARNING).exists()
@@ -976,7 +978,7 @@ class BulkDeleteTestCase(TransactionTestCase):
             pk_list=statuses_to_delete,
             username=self.user.username,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         job_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(job_log.message, f'User "{self.user}" does not have permission to delete status objects')
         self.assertEqual(Status.objects.filter(pk__in=statuses_to_delete).count(), len(statuses_to_delete))
@@ -999,7 +1001,7 @@ class BulkDeleteTestCase(TransactionTestCase):
             pk_list=statuses_to_delete,
             username=self.user.username,
         )
-        self.assertEqual(job_result.status, JobResultStatusChoices.STATUS_FAILURE)
+        self.assertJobResultStatus(job_result, JobResultStatusChoices.STATUS_FAILURE)
         error_log = JobLogEntry.objects.get(job_result=job_result, log_level=LogLevelChoices.LOG_ERROR)
         self.assertEqual(
             error_log.message, "You do not have permissions to delete some of the objects provided in `pk_list`."

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. "
+                    )
+                }
+            )

nautobot/dcim/templates/dcim/virtualdevicecontext_retrieve.html

@@ -4,65 +4,3 @@
 {% block extra_breadcrumbs %}
     <li><a href="{% url 'dcim:device' pk=object.device.pk %}">{{ object.device }}</a></li>
 {% endblock extra_breadcrumbs %}
-
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Virtual Device Context</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Name</td>
-                <td>
-                    {{ object.name }}
-                </td>
-            </tr>
-            <tr>
-                <td>Identifier</td>
-                <td>
-                    {{ object.identifier }}
-                </td>
-            </tr>
-            <tr>
-                <td>Role</td>
-                <td>
-                    {{ object.role| hyperlinked_object_with_color }}
-                </td>
-            </tr>
-            <tr>
-                <td>Status</td>
-                <td>
-                    {{ object.status| hyperlinked_object_with_color }}
-                </td>
-            </tr>
-            <tr>
-                <td>Device</td>
-                <td>
-                    {{ object.device|hyperlinked_object }}
-                </td>
-            </tr>
-            <tr>
-                <td>Primary IPv4</td>
-                <td>
-                    {{ object.primary_ip4|hyperlinked_object }}
-                </td>
-            </tr>
-            <tr>
-                <td>Primary IPv6</td>
-                <td>
-                    {{ object.primary_ip6|hyperlinked_object }}
-                </td>
-            </tr>
-            {% include 'inc/tenant_table_row.html' %}
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description|placeholder }}</td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_full_width_page %}
-    {% include 'panel_table.html' with table=interfaces_table heading="Interfaces" %}
-{% endblock content_full_width_page %}

nautobot/dcim/templates/dcim/virtualdevicecontext_update.html

@@ -23,6 +23,12 @@
             {% endif %}
         </div>
     </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>VRF Assignments</strong></div>
+        <div class="panel-body">
+            {% render_field form.vrfs %}
+        </div>
+    </div>
     {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
 {% endblock %}