nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/tenancy/__init__.py

@@ -1 +0,0 @@
-default_app_config = "nautobot.tenancy.apps.TenancyConfig"

nautobot/tenancy/apps.py

@@ -2,5 +2,6 @@ from nautobot.core.apps import NautobotConfig
 
 
 class TenancyConfig(NautobotConfig):
+    default = True
     name = "nautobot.tenancy"
     searchable_models = ["tenant"]

nautobot/tenancy/factory.py

@@ -1,5 +1,6 @@
 import factory
 
+from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.factory import (
     NautobotBoolIterator,
     OrganizationalModelFactory,
@@ -21,7 +22,7 @@ class TenantGroupFactory(OrganizationalModelFactory):
     name = UniqueFaker("company")
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     has_parent = NautobotBoolIterator()
     parent = factory.Maybe("has_parent", random_instance(TenantGroup), None)
@@ -42,7 +43,7 @@ class TenantFactory(PrimaryModelFactory):
     comments = factory.Maybe("has_comments", factory.Faker("paragraph"), "")
 
     has_description = NautobotBoolIterator()
-    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=200), "")
+    description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
     has_tenant_group = NautobotBoolIterator()
     tenant_group = factory.Maybe("has_tenant_group", random_instance(TenantGroup), None)

nautobot/tenancy/filters/__init__.py

@@ -103,6 +103,7 @@ class TenantFilterSet(NautobotFilterSet):
         label="Has IP addresses",
     )
     locations = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         to_field_name="name",
         label="Locations (names and/or IDs)",

nautobot/tenancy/forms.py

@@ -12,8 +12,8 @@ from nautobot.extras.forms import (
     NautobotBulkEditForm,
     NautobotFilterForm,
     NautobotModelForm,
-    TagsBulkEditFormMixin,
 )
+from nautobot.extras.forms.mixins import TagsBulkEditFormMixin
 
 from .models import Tenant, TenantGroup
 

nautobot/tenancy/templates/tenancy/tenant.html

@@ -44,48 +44,52 @@
             </div>
             <div class="row panel-body">
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:location_list' %}?tenant={{ object.name }}" class="btn {% if stats.location_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.location_count }}</a></h2>
-                    <p>Locations</p>
-                </div>
-                <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:rack_list' %}?tenant={{ object.name }}" class="btn {% if stats.rack_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rack_count }}</a></h2>
-                    <p>Racks</p>
+                    <h2><a href="{% url 'circuits:circuit_list' %}?tenant={{ object.name }}" class="btn {% if stats.circuit_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.circuit_count }}</a></h2>
+                    <p>Circuits</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'dcim:rackreservation_list' %}?tenant={{ object.name }}" class="btn {% if stats.rackreservation_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rackreservation_count }}</a></h2>
-                    <p>Rack reservations</p>
+                    <h2><a href="{% url 'virtualization:cluster_list' %}?tenant={{ object.name }}" class="btn {% if stats.cluster_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.cluster_count }}</a></h2>
+                    <p>Clusters</p>
                 </div>
                 <div class="col-md-4 text-center">
                     <h2><a href="{% url 'dcim:device_list' %}?tenant={{ object.name }}" class="btn {% if stats.device_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.device_count }}</a></h2>
                     <p>Devices</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:vrf_list' %}?tenant={{ object.name }}" class="btn {% if stats.vrf_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vrf_count }}</a></h2>
-                    <p>VRFs</p>
-                </div>
-                <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:prefix_list' %}?tenant={{ object.name }}" class="btn {% if stats.prefix_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.prefix_count }}</a></h2>
-                    <p>Prefixes</p>
+                    <h2><a href="{% url 'extras:dynamicgroup_list' %}?tenant={{ object.name }}" class="btn {% if stats.dynamicgroup_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.dynamicgroup_count }}</a></h2>
+                    <p>Dynamic groups</p>
                 </div>
                 <div class="col-md-4 text-center">
                     <h2><a href="{% url 'ipam:ipaddress_list' %}?tenant={{ object.name }}" class="btn {% if stats.ipaddress_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.ipaddress_count }}</a></h2>
                     <p>IP addresses</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'ipam:vlan_list' %}?tenant={{ object.name }}" class="btn {% if stats.vlan_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vlan_count }}</a></h2>
-                    <p>VLANs</p>
+                    <h2><a href="{% url 'dcim:location_list' %}?tenant={{ object.name }}" class="btn {% if stats.location_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.location_count }}</a></h2>
+                    <p>Locations</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'circuits:circuit_list' %}?tenant={{ object.name }}" class="btn {% if stats.circuit_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.circuit_count }}</a></h2>
-                    <p>Circuits</p>
+                    <h2><a href="{% url 'ipam:prefix_list' %}?tenant={{ object.name }}" class="btn {% if stats.prefix_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.prefix_count }}</a></h2>
+                    <p>Prefixes</p>
+                </div>
+                <div class="col-md-4 text-center">
+                    <h2><a href="{% url 'dcim:rack_list' %}?tenant={{ object.name }}" class="btn {% if stats.rack_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rack_count }}</a></h2>
+                    <p>Racks</p>
+                </div>
+                <div class="col-md-4 text-center">
+                    <h2><a href="{% url 'dcim:rackreservation_list' %}?tenant={{ object.name }}" class="btn {% if stats.rackreservation_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.rackreservation_count }}</a></h2>
+                    <p>Rack reservations</p>
                 </div>
                 <div class="col-md-4 text-center">
                     <h2><a href="{% url 'virtualization:virtualmachine_list' %}?tenant={{ object.name }}" class="btn {% if stats.virtualmachine_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.virtualmachine_count }}</a></h2>
                     <p>Virtual machines</p>
                 </div>
                 <div class="col-md-4 text-center">
-                    <h2><a href="{% url 'virtualization:cluster_list' %}?tenant={{ object.name }}" class="btn {% if stats.cluster_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.cluster_count }}</a></h2>
-                    <p>Clusters</p>
+                    <h2><a href="{% url 'ipam:vlan_list' %}?tenant={{ object.name }}" class="btn {% if stats.vlan_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vlan_count }}</a></h2>
+                    <p>VLANs</p>
+                </div>
+                <div class="col-md-4 text-center">
+                    <h2><a href="{% url 'ipam:vrf_list' %}?tenant={{ object.name }}" class="btn {% if stats.vrf_count %}btn-primary{% else %}btn-default{% endif %} btn-lg">{{ stats.vrf_count }}</a></h2>
+                    <p>VRFs</p>
                 </div>
             </div>
         </div>

nautobot/tenancy/views.py

@@ -1,10 +1,10 @@
 from django_tables2 import RequestConfig
 
 from nautobot.circuits.models import Circuit
-from nautobot.core.models.querysets import count_related
 from nautobot.core.views import generic
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.dcim.models import Device, Location, Rack, RackReservation
+from nautobot.extras.models import DynamicGroup
 from nautobot.ipam.models import IPAddress, Prefix, VLAN, VRF
 from nautobot.virtualization.models import Cluster, VirtualMachine
 
@@ -17,7 +17,7 @@ from .models import Tenant, TenantGroup
 
 
 class TenantGroupListView(generic.ObjectListView):
-    queryset = TenantGroup.objects.annotate(tenant_count=count_related(Tenant, "tenant_group"))
+    queryset = TenantGroup.objects.all()
     filterset = filters.TenantGroupFilterSet
     filterset_form = forms.TenantGroupFilterForm
     table = tables.TenantGroupTable
@@ -59,7 +59,7 @@ class TenantGroupBulkImportView(generic.BulkImportView):  # 3.0 TODO: remove, un
 
 
 class TenantGroupBulkDeleteView(generic.BulkDeleteView):
-    queryset = TenantGroup.objects.annotate(tenant_count=count_related(Tenant, "tenant_group"))
+    queryset = TenantGroup.objects.all()
     table = tables.TenantGroupTable
     filterset = filters.TenantGroupFilterSet
 
@@ -81,22 +81,23 @@ class TenantView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         stats = {
+            "circuit_count": Circuit.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "cluster_count": Cluster.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "device_count": Device.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "ipaddress_count": IPAddress.objects.restrict(request.user, "view").filter(tenant=instance).count(),
             # TODO: Should we include child locations of the filtered locations in the location_count below?
             "location_count": Location.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "prefix_count": Prefix.objects.restrict(request.user, "view").filter(tenant=instance).count(),
             "rack_count": Rack.objects.restrict(request.user, "view").filter(tenant=instance).count(),
             "rackreservation_count": RackReservation.objects.restrict(request.user, "view")
             .filter(tenant=instance)
             .count(),
-            "device_count": Device.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "vrf_count": VRF.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "prefix_count": Prefix.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "ipaddress_count": IPAddress.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "vlan_count": VLAN.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "circuit_count": Circuit.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "dynamicgroup_count": DynamicGroup.objects.restrict(request.user, "view").filter(tenant=instance).count(),
             "virtualmachine_count": VirtualMachine.objects.restrict(request.user, "view")
             .filter(tenant=instance)
             .count(),
-            "cluster_count": Cluster.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "vlan_count": VLAN.objects.restrict(request.user, "view").filter(tenant=instance).count(),
+            "vrf_count": VRF.objects.restrict(request.user, "view").filter(tenant=instance).count(),
         }
 
         return {"stats": stats, **super().get_extra_context(request, instance)}

nautobot/users/__init__.py

@@ -1 +0,0 @@
-default_app_config = "nautobot.users.apps.UsersConfig"

nautobot/users/api/serializers.py

@@ -45,12 +45,12 @@ class UserSerializer(ValidatedModelSerializer):
         Extract the password from validated data and set it separately to ensure proper hash generation.
         """
         update_password = False
+        password = None
         if "password" in validated_data:
             update_password = True
             password = validated_data.pop("password")
         elif not self.partial:
             update_password = True
-            password = None
         super().update(instance, validated_data)
         if update_password:
             instance.set_password(password)

nautobot/users/api/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group
+from django.contrib.auth.models import AnonymousUser, Group
 from django.db.models import Count
 from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiTypes
 from rest_framework.authentication import BasicAuthentication
@@ -58,7 +58,9 @@ class TokenViewSet(ModelViewSet):
         Limit users to their own Tokens.
         """
         queryset = super().get_queryset()
-        return queryset.filter(user=self.request.user)
+        if not isinstance(self.request.user, AnonymousUser):
+            return queryset.filter(user=self.request.user)
+        return queryset.none()
 
 
 #

nautobot/users/apps.py

@@ -1,6 +1,7 @@
-from django.apps import AppConfig
+from nautobot.core.apps import NautobotConfig
 
 
-class UsersConfig(AppConfig):
+class UsersConfig(NautobotConfig):
+    default = True
     name = "nautobot.users"
     verbose_name = "Users"

nautobot/users/factory.py

@@ -3,7 +3,7 @@ from datetime import timezone
 from django.contrib.auth import get_user_model
 import factory
 
-from nautobot.core.factory import BaseModelFactory, NautobotBoolIterator
+from nautobot.core.factory import BaseModelFactory, NautobotBoolIterator, UniqueFaker
 
 User = get_user_model()
 
@@ -13,9 +13,9 @@ class UserFactory(BaseModelFactory):
         model = User
         exclude = "has_email"
 
-    first_name = factory.Faker("first_name")
+    first_name = UniqueFaker("first_name")
 
-    last_name = factory.Faker("last_name")
+    last_name = UniqueFaker("last_name")
 
     username = factory.LazyAttribute(lambda u: f"{u.first_name[0].lower()}{u.last_name.lower()}")
 

nautobot/users/migrations/0010_user_default_saved_views.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.14 on 2024-07-15 19:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0113_saved_views"),
+        ("users", "0009_update_all_charfields_max_length_to_255"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="default_saved_views",
+            field=models.ManyToManyField(
+                blank=True, related_name="users", through="extras.UserSavedViewAssociation", to="extras.savedview"
+            ),
+        ),
+    ]

nautobot/users/models.py

@@ -54,10 +54,20 @@ class User(BaseModel, AbstractUser):
     """
 
     config_data = models.JSONField(encoder=DjangoJSONEncoder, default=dict, blank=True)
+    default_saved_views = models.ManyToManyField(
+        to="extras.SavedView",
+        related_name="users",
+        through="extras.UserSavedViewAssociation",
+        through_fields=("user", "saved_view"),
+        blank=True,
+        verbose_name="user-specific default saved views",
+        help_text="User specific default saved views",
+    )
 
     # TODO: we don't currently have a general "Users" guide.
     documentation_static_path = "docs/development/core/user-preferences.html"
     objects = UserManager()
+    is_metadata_associable_model = False
 
     class Meta:
         db_table = "auth_user"
@@ -192,6 +202,7 @@ class Token(BaseModel):
 
     documentation_static_path = "docs/user-guide/platform-functionality/users/token.html"
     natural_key_field_names = ["pk"]  # default would be `["key"]`, which is obviously not ideal!
+    is_metadata_associable_model = False
 
     class Meta:
         ordering = ["created"]
@@ -267,6 +278,7 @@ class ObjectPermission(BaseModel, ChangeLoggedModel):
     )
 
     documentation_static_path = "docs/user-guide/platform-functionality/users/objectpermission.html"
+    is_metadata_associable_model = False
 
     class Meta:
         ordering = ["name"]

nautobot/users/tests/test_filters.py

@@ -112,12 +112,15 @@ class UserTestCase(FilterTestCases.FilterTestCase):
 
     def test_is_staff(self):
         params = {"is_staff": True}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs, self.queryset.filter(is_staff=True)
+        )
 
     def test_is_active(self):
         params = {"is_active": True}
-        # 4 created active users in setUpTestData, plus one created active user in TestCase.setUp
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs, self.queryset.filter(is_active=True)
+        )
 
     def test_search(self):
         value = self.queryset.values_list("pk", flat=True)[0]

nautobot/users/urls.py

@@ -1,8 +1,14 @@
 from django.urls import path
 
+from nautobot.core.views.routers import NautobotUIViewSetRouter
+
 from . import views
 
+# TODO: deprecate this app_name and use users
 app_name = "user"
+
+router = NautobotUIViewSetRouter()
+
 urlpatterns = [
     path("profile/", views.ProfileView.as_view(), name="profile"),
     path("preferences/", views.UserConfigView.as_view(), name="preferences"),
@@ -17,3 +23,5 @@ urlpatterns = [
     ),
     path("advanced-settings/", views.AdvancedProfileSettingsEditView.as_view(), name="advanced_settings_edit"),
 ]
+
+urlpatterns += router.urls

nautobot/virtualization/__init__.py

@@ -1 +0,0 @@
-default_app_config = "nautobot.virtualization.apps.VirtualizationConfig"

nautobot/virtualization/apps.py

@@ -2,6 +2,7 @@ from nautobot.core.apps import NautobotConfig
 
 
 class VirtualizationConfig(NautobotConfig):
+    default = True
     name = "nautobot.virtualization"
     searchable_models = [
         "cluster",

nautobot/virtualization/filters.py

@@ -156,6 +156,7 @@ class VirtualMachineFilterSet(
         label="Cluster (ID)",
     )
     location = TreeNodeMultipleChoiceFilter(
+        prefers_id=True,
         queryset=Location.objects.all(),
         field_name="cluster__location",
         to_field_name="name",
@@ -262,7 +263,9 @@ class VirtualMachineFilterSet(
         return queryset.filter(primary_ip6__in=ip_queryset)
 
 
-class VMInterfaceFilterSet(BaseFilterSet, StatusModelFilterSetMixin, CustomFieldModelFilterSetMixin):
+class VMInterfaceFilterSet(
+    BaseFilterSet, RoleModelFilterSetMixin, StatusModelFilterSetMixin, CustomFieldModelFilterSetMixin
+):
     q = SearchFilter(filter_predicates={"name": "icontains"})
 
     cluster_id = django_filters.ModelMultipleChoiceFilter(
@@ -318,6 +321,7 @@ class VMInterfaceFilterSet(BaseFilterSet, StatusModelFilterSetMixin, CustomField
         label="MAC address",
     )
     tagged_vlans = NaturalKeyOrPKMultipleChoiceFilter(
+        prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
         label="Tagged VLANs (VID or ID)",
@@ -327,6 +331,7 @@ class VMInterfaceFilterSet(BaseFilterSet, StatusModelFilterSetMixin, CustomField
         label="Has Tagged VLANs",
     )
     untagged_vlan = NaturalKeyOrPKMultipleChoiceFilter(
+        prefers_id=True,
         to_field_name="vid",
         queryset=VLAN.objects.all(),
         label="Untagged VLAN (VID or ID)",

nautobot/virtualization/forms.py

@@ -37,6 +37,7 @@ from nautobot.extras.forms import (
     NautobotModelForm,
     RoleModelBulkEditFormMixin,
     RoleModelFilterFormMixin,
+    RoleNotRequiredModelFormMixin,
     StatusModelBulkEditFormMixin,
     StatusModelFilterFormMixin,
     TagsBulkEditFormMixin,
@@ -462,6 +463,7 @@ class VMInterfaceForm(NautobotModelForm, InterfaceCommonForm):
         fields = [
             "virtual_machine",
             "name",
+            "role",
             "enabled",
             "parent_interface",
             "bridge",
@@ -501,7 +503,8 @@ class VMInterfaceForm(NautobotModelForm, InterfaceCommonForm):
             self.fields["tagged_vlans"].widget.add_query_param("locations", location.pk)
 
 
-class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
+class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm, RoleNotRequiredModelFormMixin):
+    model = VMInterface
     virtual_machine = DynamicModelChoiceField(queryset=VirtualMachine.objects.all())
     name_pattern = ExpandableNameField(label="Name")
     enabled = forms.BooleanField(required=False, initial=True)
@@ -574,7 +577,9 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
             self.fields["tagged_vlans"].widget.add_query_param("locations", location.pk)
 
 
-class VMInterfaceBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, NautobotBulkEditForm):
+class VMInterfaceBulkEditForm(
+    TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, RoleModelBulkEditFormMixin, NautobotBulkEditForm
+):
     pk = forms.ModelMultipleChoiceField(queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput())
     virtual_machine = forms.ModelChoiceField(
         queryset=VirtualMachine.objects.all(),
@@ -653,7 +658,7 @@ class VMInterfaceBulkRenameForm(BulkRenameForm):
     pk = forms.ModelMultipleChoiceField(queryset=VMInterface.objects.all(), widget=forms.MultipleHiddenInput())
 
 
-class VMInterfaceFilterForm(NautobotFilterForm, StatusModelFilterFormMixin):
+class VMInterfaceFilterForm(NautobotFilterForm, RoleModelFilterFormMixin, StatusModelFilterFormMixin):
     model = VMInterface
     cluster_id = DynamicModelMultipleChoiceField(queryset=Cluster.objects.all(), required=False, label="Cluster")
     virtual_machine_id = DynamicModelMultipleChoiceField(
@@ -682,7 +687,9 @@ class VirtualMachineBulkAddComponentForm(CustomFieldModelBulkEditFormMixin, Boot
 class VMInterfaceBulkCreateForm(
     form_from_model(VMInterface, ["enabled", "mtu", "description", "mode", "tags"]),
     VirtualMachineBulkAddComponentForm,
+    RoleNotRequiredModelFormMixin,
 ):
+    model = VMInterface
     status = DynamicModelChoiceField(
         queryset=Status.objects.all(),
         query_params={"content_types": VMInterface._meta.label_lower},
@@ -691,6 +698,7 @@ class VMInterfaceBulkCreateForm(
     field_order = (
         "name_pattern",
         "status",
+        "role",
         "enabled",
         "mtu",
         "description",

nautobot/virtualization/graphql/types.py

@@ -16,7 +16,7 @@ class ClusterType(OptimizedNautobotObjectType):
         filterset_class = ClusterFilterSet
 
     def resolve_dynamic_groups(self, args):
-        return DynamicGroup.objects.get_for_object(self, use_cache=True)
+        return DynamicGroup.objects.get_for_object(self)
 
 
 class VirtualMachineType(OptimizedNautobotObjectType):
@@ -29,7 +29,7 @@ class VirtualMachineType(OptimizedNautobotObjectType):
         filterset_class = VirtualMachineFilterSet
 
     def resolve_dynamic_groups(self, args):
-        return DynamicGroup.objects.get_for_object(self, use_cache=True)
+        return DynamicGroup.objects.get_for_object(self)
 
 
 class VMInterfaceType(OptimizedNautobotObjectType):

nautobot/virtualization/migrations/0029_add_role_field_to_interface_models.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.25 on 2024-04-01 13:36
+
+from django.db import migrations
+import django.db.models.deletion
+
+import nautobot.extras.models.roles
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0106_populate_default_statuses_and_roles_for_contact_associations"),
+        ("virtualization", "0028_update_all_charfields_max_length_to_255"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="vminterface",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="vm_interfaces",
+                to="extras.role",
+            ),
+        ),
+    ]

nautobot/virtualization/migrations/0030_alter_virtualmachine_local_config_context_data_owner_content_type_and_more.py

@@ -0,0 +1,67 @@
+# Generated by Django 4.2.9 on 2024-01-17 18:52
+
+from django.db import migrations
+import django.db.models.deletion
+
+import nautobot.core.models.fields
+import nautobot.extras.models.roles
+import nautobot.extras.models.statuses
+import nautobot.extras.utils
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("extras", "0110_alter_configcontext_cluster_groups_and_more"),
+        ("virtualization", "0029_add_role_field_to_interface_models"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="local_config_context_data_owner_content_type",
+            field=nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                blank=True,
+                default=None,
+                limit_choices_to=nautobot.extras.utils.FeatureQuery("config_context_owners"),
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="contenttypes.contenttype",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="local_config_context_schema",
+            field=nautobot.core.models.fields.ForeignKeyWithAutoRelatedName(
+                blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to="extras.configcontextschema"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="virtualmachine",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, to="extras.status"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vminterface",
+            name="role",
+            field=nautobot.extras.models.roles.RoleField(
+                blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to="extras.role"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vminterface",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, to="extras.status"
+            ),
+        ),
+    ]

nautobot/virtualization/models.py

@@ -83,7 +83,6 @@ class ClusterGroup(OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -169,7 +168,6 @@ class Cluster(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "statuses",