nautobot 2.3.16__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/project-static/img/jinja_logo.svg

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="96"
+   height="96"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   version="1.0"
+   sodipodi:docname="Jinja_software_logo.svg"
+   inkscape:export-filename="/Users/mitsuhiko/Development/jinja2/docs/_static/jinjabanner.png"
+   inkscape:export-xdpi="60"
+   inkscape:export-ydpi="60"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6558">
+      <stop
+         style="stop-color:#007dff;stop-opacity:1;"
+         offset="0"
+         id="stop6560" />
+      <stop
+         style="stop-color:#007dff;stop-opacity:1;"
+         offset="1"
+         id="stop6562" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6558"
+       id="radialGradient6564"
+       cx="61.297768"
+       cy="60.910988"
+       fx="61.297768"
+       fy="60.910988"
+       r="44.688255"
+       gradientTransform="matrix(1,0,0,0.945104,0,3.343747)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="137.67857"
+     inkscape:cy="57.5"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="120px"
+     height="120px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1396"
+     inkscape:window-height="900"
+     inkscape:window-x="295"
+     inkscape:window-y="40"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-13.571429,-13.928572)">
+    <path
+       style="fill:url(#radialGradient6564);fill-opacity:1;fill-rule:evenodd;stroke:#007dff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 105.45673,18.675923 c 0,0 -17.244781,8.242538 -31.283896,10.061975 -14.039107,1.819435 -40.8124,3.639673 -46.127212,2.355358 -5.314804,-1.284315 -9.129977,-2.78406 -9.129977,-2.78406 l 1.105796,3.747387 -3.411928,2.995888 0.604887,1.069255 1.40352,0.105914 4.30981,0.534612 0.604891,1.926657 2.405354,0.216875 1.205046,4.065143 c 0,0 5.111743,0.428701 6.615932,0.428701 1.504189,0 4.513013,-0.211826 4.513013,-0.211826 l 0.09924,1.603855 1.1058,0.211838 v 1.820732 l -2.410085,2.143532 0.60489,0.105912 v 0.746456 c 0,0 -5.41635,0.43203 -7.622506,0.110963 -2.206144,-0.321084 -2.608554,-0.322804 -2.608554,-0.322804 l -0.198489,0.211841 -0.09924,0.963328 h 0.500925 l 0.198474,4.176089 11.133671,-0.4287 -0.803363,14.449903 -0.09925,1.815695 -9.4277,-0.534626 -0.09924,-3.853303 h 2.102918 l 0.203211,-1.497956 1.904434,-0.4287 0.302448,-0.423665 -7.12158,-1.714818 -5.415611,1.603855 0.902596,0.751503 h 0.902612 l 0.09924,1.286116 1.904445,0.105912 v 3.747387 l -2.102919,0.53463 0.401674,0.852369 0.500925,0.322785 v 2.889986 h 1.304284 v 13.375612 l -2.107646,0.322791 0.302437,3.853297 1.29956,0.216875 -0.198476,8.775868 5.718048,0.1059 -1.205036,-8.669926 8.624341,-0.211842 -0.600161,4.705689 -0.80336,3.318679 8.723576,0.10591 0.09924,-8.558977 6.015767,-0.534612 -0.29772,5.45717 -0.203201,3.207719 h 5.117899 l -0.20321,-8.775853 0.704123,0.110964 0.198485,-4.176105 h -0.803361 l -0.297723,-1.714818 -0.500924,-4.922556 0.198485,-5.668996 h 1.101071 v -3.424601 l -1.403517,0.10591 0.203199,-4.039919 1.630357,-0.161388 0.07561,-1.311334 0.926236,-0.136182 0.949857,-0.721236 -5.713334,-1.175154 -5.666072,1.255848 0.552898,0.907857 0.600162,-0.05044 0.699398,-0.02522 0.1276,1.654296 1.578368,-0.07565 0.02835,3.58095 -6.795506,-0.15635 0.226837,-3.828095 0.222099,-3.480075 v -4.574549 l 0.20321,-4.81663 13.609913,-0.696015 16.194854,-0.933059 0.151215,3.076591 -0.576523,7.383817 -0.250464,6.874418 -5.963796,-0.105915 -0.02835,-4.816629 2.206879,-0.08069 0.09925,-1.361781 0.902596,-0.136178 -0.04726,-0.267302 0.90261,-0.05044 0.500912,-0.670795 -6.743521,-1.578651 -6.719895,1.44247 0.477288,0.832193 0.751385,-0.05549 v 0.378277 h 0.926233 v 1.523161 l 1.980057,0.02522 -0.02364,4.226529 h -2.003678 l -0.02835,0.963331 0.704124,0.08069 -0.07561,3.666695 1.479132,0.08071 -0.174851,14.530598 -1.956419,0.398445 0.02363,0.696015 h 0.680499 v 3.72217 h 1.124707 l -0.297722,5.083953 -0.378048,4.438358 7.121569,0.1866 -0.226828,-3.853298 -0.524546,-3.207722 -0.103963,-2.784073 6.044121,-0.105914 -0.174851,4.307231 -0.02835,4.549316 3.411932,0.26731 4.635874,-0.1866 1.455507,-0.42872 -0.80337,-2.436048 -0.198478,-3.828092 -0.378047,-2.728585 5.765306,-0.211826 -0.250459,3.343904 -0.02363,5.245327 2.30612,0.21183 2.282498,-0.0504 1.101077,-0.348 -0.652135,-4.978015 -0.222116,-3.747394 0.978216,-0.105915 0.02363,-3.343902 0.274093,-0.05548 -0.04728,-0.721233 h -1.129421 l -0.226827,-2.461285 -0.09924,-10.677284 0.850626,-0.02522 v -3.505308 l 0.354416,0.05549 v -0.696017 l -1.25702,-0.110961 0.02835,-4.06514 2.102917,-0.186605 -0.122861,-1.366825 0.926237,-0.08069 -0.052,-0.267314 1.228675,-0.61532 -6.24261,-1.255849 -6.341832,1.286115 0.401673,0.746456 0.978213,-0.0807 0.05199,0.32279 h 0.826987 l 0.04726,1.603855 2.05567,-0.02522 0.174848,3.934007 -7.268076,-0.05547 -0.850624,-5.911092 -0.680487,-3.132083 -0.548183,-5.618557 0.326073,-3.288431 14.488882,-1.099496 0.04726,-4.897336 0.727755,-0.186608 -0.04724,-0.746454 -0.552908,-0.322787 c -1.14e-4,0 -7.922562,1.174894 -10.429546,1.442468 -0.706297,0.07537 -0.652807,0.07042 -1.228673,0.13113 l -0.07561,-0.907852 -2.996075,-1.568554 0.03781,-1.825778 1.030198,-0.03027 0.0756,-2.51171 c 0,0 6.139781,-0.402974 8.421138,-0.938108 2.281355,-0.535141 5.51485,-1.069244 5.51485,-1.069244 l 1.531113,-4.145836 3.033892,-0.882633 0.250451,-0.696015 6.86639,-1.901424 0.77974,-0.640542 -2.60858,-5.699265 0.25048,-1.286117 1.32792,-0.696013 0.95457,-2.915207 z m -32.989856,21.727805 -0.03781,2.072926 1.554746,0.06556 -0.09924,1.96701 -3.048061,1.997266 -0.189019,0.57497 1.228671,0.01009 -0.0095,0.484186 -9.31428,0.453923 0.06143,-1.37691 0.425312,-0.685933 0.02835,-0.438784 0.0095,-0.948193 0.264629,-0.630458 0.09924,-0.509392 v -0.363141 l 0.401684,-1.603871 z m -19.479186,1.765256 -0.226835,1.392043 0.727746,0.857404 -0.04725,1.497955 0.675763,1.044022 -0.17485,1.230631 0.500923,0.721234 -9.503313,0.373227 -0.02363,-0.317741 1.101086,-0.13618 0.05197,-0.403482 -2.405367,-1.3063 -0.127589,-2.088047 1.15306,-0.05547 0.09925,-2.249446 z m 14.063574,32.107534 5.765308,0.373224 -0.198471,7.762091 0.751371,6.365024 -6.115005,-0.211839 z m -38.608682,0.322786 9.229227,0.479138 -0.803361,5.35126 v 4.498891 l 0.652137,2.511709 -9.026014,0.428704 z m 59.066078,0.05044 V 87.92449 l -5.864545,0.428706 -0.203201,-7.010602 -0.652148,-6.531449 z m -44.421242,0.29757 6.819132,0.02522 0.07089,12.306371 -6.365468,0.110961 -0.326075,-3.989484 -0.02363,-3.959223 z"
+       id="path4735" />
+  </g>
+</svg>

nautobot/project-static/js/forms.js

@@ -210,7 +210,7 @@ function initializeDynamicChoiceSelection(context, dropdownParent=null){
     this_context = $(context);
     this_context.find('.nautobot-select2-api').each(function(){
         thisobj = $(this);
-        placeholder = thisobj.attr("data-null-option") || "---------";
+        placeholder = "---------";
         thisobj.select2({
             allowClear: true,
             placeholder: placeholder,
@@ -267,6 +267,11 @@ function initializeDynamicChoiceSelection(context, dropdownParent=null){
                                         let id_prefix = element_id.match(/id_form-[0-9]+-/i, "")[0];
                                         ref_field = $("#" + id_prefix + value.slice(1));
                                     }
+                                    // If the element is in a table row with a class containing "dynamic-formset"
+                                    // We need to find the reference field in the same row
+                                    else if ($(element).closest("tr") && $(element).closest("tr").attr("class") && $(element).closest("tr").attr("class").includes("dynamic-formset")){
+                                        ref_field = $(element).closest("tr").find("select[id*=" + value.slice(1) + "]");
+                                    }
                                     else {
                                         ref_field = $('#id_' + value.slice(1));
                                     }

nautobot/project-static/js/nav_menu.js

@@ -237,8 +237,9 @@ document.addEventListener('DOMContentLoaded', function() {
     if (activeLink) {
         let previouslyClickedLink = document.querySelector('.navbar-fixed-left .navbar-nav > .dropdown > .nav-dropdown-menu > li > a[href="' + activeLink + '"]');
         let currentLocation = window.location.pathname + window.location.search;
+        let previouslyClickedLinkNoSearch = previouslyClickedLink.getAttribute('href').split('?')[0];
 
-        if (previouslyClickedLink && currentLocation.includes(previouslyClickedLink.getAttribute('href'))) {
+        if (previouslyClickedLink && (currentLocation.includes(previouslyClickedLink.getAttribute('href')) || currentLocation.includes(previouslyClickedLinkNoSearch))) {
             previouslyClickedLink.parentElement.classList.add('active');
         }
         else {

nautobot/tenancy/api/serializers.py

@@ -15,7 +15,6 @@ class TenantGroupSerializer(NautobotModelSerializer, TreeModelSerializerMixin):
     class Meta:
         model = TenantGroup
         fields = "__all__"
-        list_display_fields = ["name", "tenant_count", "description", "actions"]
 
 
 class TenantSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
@@ -32,4 +31,3 @@ class TenantSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = Tenant
         fields = "__all__"
-        list_display_fields = ["name", "tenant_group", "description"]

nautobot/tenancy/api/views.py

@@ -26,19 +26,15 @@ class TenantGroupViewSet(NautobotModelViewSet):
 
 
 class TenantViewSet(NautobotModelViewSet):
-    queryset = (
-        Tenant.objects.select_related("tenant_group")
-        .prefetch_related("tags")
-        .annotate(
-            circuit_count=count_related(Circuit, "tenant"),
-            device_count=count_related(Device, "tenant"),
-            ipaddress_count=count_related(IPAddress, "tenant"),
-            prefix_count=count_related(Prefix, "tenant"),
-            rack_count=count_related(Rack, "tenant"),
-            virtualmachine_count=count_related(VirtualMachine, "tenant"),
-            vlan_count=count_related(VLAN, "tenant"),
-            vrf_count=count_related(VRF, "tenant"),
-        )
+    queryset = Tenant.objects.annotate(
+        circuit_count=count_related(Circuit, "tenant"),
+        device_count=count_related(Device, "tenant"),
+        ipaddress_count=count_related(IPAddress, "tenant"),
+        prefix_count=count_related(Prefix, "tenant"),
+        rack_count=count_related(Rack, "tenant"),
+        virtualmachine_count=count_related(VirtualMachine, "tenant"),
+        vlan_count=count_related(VLAN, "tenant"),
+        vrf_count=count_related(VRF, "tenant"),
     )
     serializer_class = serializers.TenantSerializer
     filterset_class = filters.TenantFilterSet

nautobot/tenancy/factory.py

@@ -45,5 +45,5 @@ class TenantFactory(PrimaryModelFactory):
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("text", max_nb_chars=CHARFIELD_MAX_LENGTH), "")
 
-    has_tenant_group = NautobotBoolIterator()
+    has_tenant_group = NautobotBoolIterator(chance_of_getting_true=90)
     tenant_group = factory.Maybe("has_tenant_group", random_instance(TenantGroup), None)

nautobot/tenancy/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -54,29 +51,3 @@ menu_items = (
         ),
     ),
 )
-
-navigation = (
-    NavContext(
-        name="Inventory",
-        groups=(
-            NavGrouping(
-                name="Tenancy",
-                weight=300,
-                items=(
-                    NavItem(
-                        name="Tenants",
-                        weight=100,
-                        link="tenancy:tenant_list",
-                        permissions=["tenancy.view_tenant"],
-                    ),
-                    NavItem(
-                        name="Tenant Groups",
-                        weight=200,
-                        link="tenancy:tenantgroup_list",
-                        permissions=["tenancy.view_tenantgroup"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/tenancy/templates/tenancy/tenant.html

@@ -1,96 +1,9 @@
 {% extends 'generic/object_detail.html' %}
 {% load helpers %}
+{% load ui_framework %}
 
 {% block extra_breadcrumbs %}
-                {% if object.tenant_group %}
-                    <li><a href="{% url 'tenancy:tenant_list' %}?tenant_group={{ object.tenant_group.name }}">{{ object.tenant_group }}</a></li>
-                {% endif %}
+    {% if object.tenant_group %}
+        <li><a href="{% url 'tenancy:tenant_list' %}?tenant_group={{ object.tenant_group.name }}">{{ object.tenant_group }}</a></li>
+    {% endif %}
 {% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Tenant</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Tenant Group</td>
-                    <td>{{ object.tenant_group|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body rendered-markdown">
-                {% if object.comments %}
-                    {{ object.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Stats</strong>
-            </div>
-            <div class="panel-body">
-                <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>
-                </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>
-                </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 '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 '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 '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 '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>
-{% endblock content_right_page %}

nautobot/tenancy/tests/test_filters.py

@@ -1,13 +1,11 @@
 import factory
 
-from nautobot.circuits.models import Circuit
 from nautobot.core.testing import FilterTestCases
 
 # TODO: move this to nautobot.core.management.commands.generate_test_data and update all impacted tests
 from nautobot.dcim.factory import RackFactory, RackReservationFactory
-from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Platform, Rack, RackReservation
+from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Platform
 from nautobot.extras.models import Role, Status, Tag
-from nautobot.ipam.models import IPAddress, Prefix, RouteTarget, VLAN, VRF
 from nautobot.tenancy.filters import TenantFilterSet, TenantGroupFilterSet
 from nautobot.tenancy.models import Tenant, TenantGroup
 from nautobot.users.factory import UserFactory
@@ -17,18 +15,17 @@ from nautobot.virtualization.factory import (
     ClusterTypeFactory,
     VirtualMachineFactory,
 )
-from nautobot.virtualization.models import Cluster, VirtualMachine
 
 
-class TenantGroupTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class TenantGroupTestCase(FilterTestCases.FilterTestCase):
     queryset = TenantGroup.objects.all()
     filterset = TenantGroupFilterSet
-
-    def test_description(self):
-        params = {
-            "description": TenantGroup.objects.exclude(description__exact="").values_list("description", flat=True)[:2]
-        }
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+    generic_filter_tests = (
+        ("description",),
+        ("name",),
+        ("tenants", "tenants__id"),
+        ("tenants", "tenants__name"),
+    )
 
     def test_parent(self):
         parent_groups = TenantGroup.objects.filter(children__isnull=False)
@@ -52,19 +49,30 @@ class TenantGroupTestCase(FilterTestCases.NameOnlyFilterTestCase):
             TenantGroup.objects.filter(children__in=[child_groups[0], child_groups[1]]).distinct(),
         )
 
-    def test_tenants(self):
-        """Test the `tenants` filter."""
-        tenants = Tenant.objects.filter(tenant_group__isnull=False)
-        params = {"tenants": [tenants[0].pk, tenants[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            TenantGroup.objects.filter(tenants__in=[tenants[0], tenants[1]]).distinct(),
-        )
 
-
-class TenantTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class TenantTestCase(FilterTestCases.FilterTestCase):
     queryset = Tenant.objects.all()
     filterset = TenantFilterSet
+    generic_filter_tests = (
+        ("circuits", "circuits__id"),
+        ("clusters", "clusters__id"),
+        ("clusters", "clusters__name"),
+        ("comments",),
+        ("description",),
+        ("devices", "devices__id"),
+        ("devices", "devices__name"),
+        ("ip_addresses", "ip_addresses__id"),
+        ("name",),
+        ("prefixes", "prefixes__id"),
+        ("rack_reservations", "rack_reservations__id"),
+        ("racks", "racks__id"),
+        ("route_targets", "route_targets__id"),
+        ("route_targets", "route_targets__name"),
+        ("virtual_machines", "virtual_machines__id"),
+        ("virtual_machines", "virtual_machines__name"),
+        ("vlans", "vlans__id"),
+        ("vrfs", "vrfs__id"),
+    )
 
     @classmethod
     def setUpTestData(cls):
@@ -115,42 +123,6 @@ class TenantTestCase(FilterTestCases.NameOnlyFilterTestCase):
         tenant = Tenant.objects.first()
         tenant.tags.set(Tag.objects.all()[:2])
 
-    def test_description(self):
-        params = {
-            "description": Tenant.objects.exclude(description__exact="").values_list("description", flat=True)[:2]
-        }
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
-    def test_comments(self):
-        params = {"comments": Tenant.objects.exclude(comments__exact="").values_list("comments", flat=True)[:2]}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
-    def test_circuits(self):
-        """Test the `circuits` filter."""
-        circuits = list(Circuit.objects.filter(tenant__isnull=False))[:2]
-        params = {"circuits": [circuits[0].pk, circuits[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(circuits__in=circuits).distinct(),
-        )
-
-    def test_clusters(self):
-        """Test the `clusters` filter."""
-        clusters = list(Cluster.objects.filter(tenant__isnull=False))[:2]
-        params = {"clusters": [clusters[0].pk, clusters[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(clusters__in=clusters).distinct(),
-        )
-
-    def test_devices(self):
-        """Test the `devices` filter."""
-        params = {"devices": [self.devices[0].pk, self.devices[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(devices__in=self.devices).distinct(),
-        )
-
     def test_tenant_group(self):
         groups = list(TenantGroup.objects.filter(tenants__isnull=False))[:2]
         groups_including_children = []
@@ -167,86 +139,9 @@ class TenantTestCase(FilterTestCases.NameOnlyFilterTestCase):
             self.queryset.filter(tenant_group__in=groups_including_children),
         )
 
-    def test_ip_addresses(self):
-        """Test the `ip_addresses` filter."""
-        ip_addresses = list(IPAddress.objects.filter(tenant__isnull=False))[:2]
-        params = {"ip_addresses": [ip_addresses[0].pk, ip_addresses[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(ip_addresses__in=ip_addresses).distinct(),
-        )
-
     def test_locations(self):
         params = {"locations": [self.locations[0].pk, self.locations[1].name]}
         self.assertQuerysetEqualAndNotEmpty(
             self.filterset(params, self.queryset).qs,
             self.queryset.filter(locations__in=[self.locations[0], self.locations[1]]).distinct(),
         )
-
-    def test_prefixes(self):
-        """Test the `prefixes` filter."""
-        prefixes = list(Prefix.objects.filter(tenant__isnull=False))[:2]
-        params = {"prefixes": [prefixes[0].pk, prefixes[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(prefixes__in=prefixes).distinct(),
-        )
-
-    def test_rack_reservations(self):
-        """Test the `rack_reservations` filter."""
-        rack_reservations = list(RackReservation.objects.filter(tenant__isnull=False))[:2]
-        params = {"rack_reservations": [rack_reservations[0].pk, rack_reservations[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(rack_reservations__in=rack_reservations).distinct(),
-        )
-
-    def test_racks(self):
-        """Test the `racks` filter."""
-        racks = list(Rack.objects.filter(tenant__isnull=False))[:2]
-        params = {"racks": [racks[0].pk, racks[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(racks__in=racks).distinct(),
-        )
-
-    def test_route_targets(self):
-        """Test the `route_targets` filter."""
-        route_targets = list(RouteTarget.objects.filter(tenant__isnull=False))[:2]
-        params = {"route_targets": [route_targets[0].pk, route_targets[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(route_targets__in=route_targets).distinct(),
-        )
-
-    def test_virtual_machines(self):
-        """Test the `virtual_machines` filter."""
-        virtual_machines = list(VirtualMachine.objects.filter(tenant__isnull=False))[:2]
-        params = {"virtual_machines": [virtual_machines[0].pk, virtual_machines[1].name]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(virtual_machines__in=virtual_machines).distinct(),
-        )
-
-    def test_vlans(self):
-        """Test the `vlans` filter."""
-        vlans = list(VLAN.objects.filter(tenant__isnull=False))[:2]
-        params = {"vlans": [vlans[0].pk, vlans[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(vlans__in=vlans).distinct(),
-        )
-
-    def test_vrfs(self):
-        """Test the `vrfs` filter."""
-        vrfs = list(VRF.objects.filter(tenant__isnull=False))[:2]
-        params = {"vrfs": [vrfs[0].pk, vrfs[1].pk]}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(vrfs__in=vrfs).distinct(),
-        )
-
-    def test_search(self):
-        params = {"q": self.queryset.first().name}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-        self.assertEqual(self.filterset(params, self.queryset).qs.first(), self.queryset.first())

nautobot/tenancy/views.py

@@ -1,9 +1,11 @@
 from django_tables2 import RequestConfig
 
 from nautobot.circuits.models import Circuit
+from nautobot.core.ui.choices import SectionChoices
+from nautobot.core.ui.object_detail import ObjectDetailContent, ObjectFieldsPanel, StatsPanel
 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.dcim.models import Controller, ControllerManagedDeviceGroup, 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
@@ -78,29 +80,38 @@ class TenantListView(generic.ObjectListView):
 
 class TenantView(generic.ObjectView):
     queryset = Tenant.objects.select_related("tenant_group")
-
-    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(),
-            "dynamicgroup_count": DynamicGroup.objects.restrict(request.user, "view").filter(tenant=instance).count(),
-            "virtualmachine_count": VirtualMachine.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)}
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            StatsPanel(
+                label="Stats",
+                filter_name="tenant",
+                related_models=[
+                    Circuit,
+                    Cluster,
+                    Controller,
+                    ControllerManagedDeviceGroup,
+                    Device,
+                    DynamicGroup,
+                    IPAddress,
+                    # TODO: Should we include child locations of the filtered locations in the location_count below?
+                    Location,
+                    Prefix,
+                    Rack,
+                    RackReservation,
+                    VirtualMachine,
+                    VLAN,
+                    VRF,
+                ],
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+            ),
+        )
+    )
 
 
 class TenantEditView(generic.ObjectEditView):

nautobot/users/admin.py

@@ -12,6 +12,7 @@ from django.utils.html import escape, format_html
 from nautobot.core.admin import NautobotModelAdmin
 from nautobot.core.utils.permissions import qs_filter_from_constraints
 from nautobot.extras.admin import order_content_types
+from nautobot.users.forms import AdminPasswordChangeForm
 from nautobot.users.models import AdminGroup, ObjectPermission, Token, User
 
 #
@@ -142,6 +143,7 @@ class UserAdmin(UserAdmin_):
     filter_horizontal = ("groups",)
     formfield_overrides = NautobotModelAdmin.formfield_overrides
     readonly_fields = ("config_data",)
+    change_password_form = AdminPasswordChangeForm
 
     def get_inlines(self, request, obj):
         if obj is not None:

nautobot/users/api/views.py

@@ -22,7 +22,7 @@ from . import serializers
 
 
 class UserViewSet(ModelViewSet):
-    queryset = RestrictedQuerySet(model=get_user_model()).prefetch_related("groups").order_by("username")
+    queryset = RestrictedQuerySet(model=get_user_model()).order_by("username")
     serializer_class = serializers.UserSerializer
     filterset_class = filters.UserFilterSet
 
@@ -69,7 +69,7 @@ class TokenViewSet(ModelViewSet):
 
 
 class ObjectPermissionViewSet(ModelViewSet):
-    queryset = ObjectPermission.objects.prefetch_related("object_types", "groups", "users")
+    queryset = ObjectPermission.objects.all()
     serializer_class = serializers.ObjectPermissionSerializer
     filterset_class = filters.ObjectPermissionFilterSet