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

nautobot/apps/views.py

@@ -37,6 +37,7 @@ from nautobot.core.views.utils import (
     check_filter_for_display,
     csv_format,
     get_csv_form_fields_from_serializer_class,
+    get_obj_from_context,
     handle_protectederror,
     prepare_cloned_fields,
 )
@@ -51,18 +52,12 @@ __all__ = (
     "BulkEditView",
     "BulkImportView",  # 3.0 TODO: remove this
     "BulkRenameView",
-    "check_and_call_git_repository_function",
-    "check_filter_for_display",
     "ComponentCreateView",
     "ContentTypePermissionRequiredMixin",
-    "csv_format",
     "EnhancedPage",
     "EnhancedPaginator",
     "GenericView",
-    "get_csv_form_fields_from_serializer_class",
-    "get_paginate_count",
     "GetReturnURLMixin",
-    "handle_protectederror",
     "NautobotHTMLRenderer",
     "NautobotUIViewSet",
     "NautobotViewSetMixin",
@@ -83,5 +78,12 @@ __all__ = (
     "ObjectNotesViewMixin",
     "ObjectPermissionRequiredMixin",
     "ObjectView",
+    "check_and_call_git_repository_function",
+    "check_filter_for_display",
+    "csv_format",
+    "get_csv_form_fields_from_serializer_class",
+    "get_obj_from_context",
+    "get_paginate_count",
+    "handle_protectederror",
     "prepare_cloned_fields",
 )

nautobot/circuits/api/serializers.py

@@ -57,6 +57,7 @@ class CircuitTerminationSerializer(
     NautobotModelSerializer,
     CableTerminationModelSerializerMixin,
     PathEndpointModelSerializerMixin,
+    TaggedModelSerializerMixin,
 ):
     class Meta:
         model = CircuitTermination

nautobot/circuits/api/views.py

@@ -12,7 +12,7 @@ from . import serializers
 
 
 class ProviderViewSet(NautobotModelViewSet):
-    queryset = Provider.objects.prefetch_related("tags").annotate(circuit_count=count_related(Circuit, "provider"))
+    queryset = Provider.objects.annotate(circuit_count=count_related(Circuit, "provider"))
     serializer_class = serializers.ProviderSerializer
     filterset_class = filters.ProviderFilterSet
 
@@ -34,9 +34,7 @@ class CircuitTypeViewSet(NautobotModelViewSet):
 
 
 class CircuitViewSet(NautobotModelViewSet):
-    queryset = Circuit.objects.select_related(
-        "status", "circuit_type", "tenant", "provider", "circuit_termination_a", "circuit_termination_z"
-    ).prefetch_related("tags")
+    queryset = Circuit.objects.all()
     serializer_class = serializers.CircuitSerializer
     filterset_class = filters.CircuitFilterSet
 
@@ -47,9 +45,7 @@ class CircuitViewSet(NautobotModelViewSet):
 
 
 class CircuitTerminationViewSet(PathEndpointMixin, NautobotModelViewSet):
-    queryset = CircuitTermination.objects.select_related("circuit", "location", "cable").prefetch_related(
-        "_path__destination"
-    )
+    queryset = CircuitTermination.objects.prefetch_related("_path__destination")
     serializer_class = serializers.CircuitTerminationSerializer
     filterset_class = filters.CircuitTerminationFilterSet
 
@@ -60,6 +56,6 @@ class CircuitTerminationViewSet(PathEndpointMixin, NautobotModelViewSet):
 
 
 class ProviderNetworkViewSet(NautobotModelViewSet):
-    queryset = ProviderNetwork.objects.prefetch_related("tags")
+    queryset = ProviderNetwork.objects.all()
     serializer_class = serializers.ProviderNetworkSerializer
     filterset_class = filters.ProviderNetworkFilterSet

nautobot/circuits/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -100,57 +97,3 @@ menu_items = (
         ),
     ),
 )
-
-navigation = (
-    NavContext(
-        name="Inventory",
-        groups=(
-            NavGrouping(
-                name="Circuits",
-                weight=400,
-                items=(
-                    NavItem(
-                        link="circuits:circuit_list",
-                        name="Circuits",
-                        weight=100,
-                        permissions=[
-                            "circuits.view_circuit",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:circuittermination_list",
-                        name="Circuit Terminations",
-                        weight=200,
-                        permissions=[
-                            "circuits.view_circuittermination",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:circuittype_list",
-                        name="Circuit Types",
-                        weight=300,
-                        permissions=[
-                            "circuits.view_circuittype",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:provider_list",
-                        name="Providers",
-                        weight=400,
-                        permissions=[
-                            "circuits.view_provider",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:providernetwork_list",
-                        name="Provider Networks",
-                        weight=500,
-                        permissions=[
-                            "circuits.view_providernetwork",
-                        ],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/circuits/templates/circuits/circuit_create.html

@@ -23,13 +23,7 @@
             {% render_field form.description %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Tenancy</strong></div>
-        <div class="panel-body">
-            {% render_field form.tenant_group %}
-            {% render_field form.tenant %}
-        </div>
-    </div>
+    {% include 'inc/tenancy_form_panel.html' %}
     {% include 'inc/extras_features_edit_form_fields.html' %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Comments</strong></div>

nautobot/circuits/templates/circuits/circuit_retrieve.html

@@ -4,74 +4,3 @@
 {% block extra_breadcrumbs %}
                 <li><a href="{% url 'circuits:circuit_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
 {% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuit</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Status</td>
-                    <td>
-                        {{ object.status| hyperlinked_object_with_color }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Provider</td>
-                    <td>{{ object.provider|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Circuit ID</td>
-                    <td>
-                        <span class="hover_copy"><span id="copy_circuitid">{{ object.cid }}</span><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_circuitid">
-                            <span class="mdi mdi-content-copy"></span>
-                        </button>
-                        </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Circuit Type</td>
-                    <td>{{ object.circuit_type|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>
-                        {% if object.tenant and object.tenant.tenant_group %}
-                            {{ object.tenant.tenant_group|hyperlinked_object }} /
-                        {% endif %}
-                        {{ object.tenant|hyperlinked_object }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Install Date</td>
-                    <td>{{ object.install_date|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Commit Rate</td>
-                    <td>{{ object.commit_rate|humanize_speed|placeholder }}</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 %}
-    {% include 'circuits/inc/circuit_termination.html' with termination=circuit_termination_a side='A' %}
-    {% include 'circuits/inc/circuit_termination.html' with termination=circuit_termination_z side='Z' %}
-{% endblock content_right_page %}

nautobot/circuits/templates/circuits/inc/circuit_termination.html

@@ -1,32 +1,12 @@
+<!--
+3.0 TODO: This template file is no longer used in Nautobot core, but is kept for now in 2.x in case an App is using it.
+In a future release, we should delete this file.
+-->
 {% load helpers %}
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <div class="pull-right">
-            {% if not termination and perms.circuits.add_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_add' circuit=object.pk %}?term_side={{ side }}" class="btn btn-xs btn-success">
-                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add
-                </a>
-            {% endif %}
-            {% if termination and perms.circuits.change_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-xs btn-warning">
-                    <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
-                </a>
-                <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}" class="btn btn-xs btn-primary">
-                    <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> Swap
-                </a>
-            {% endif %}
-            {% if termination and perms.circuits.delete_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-xs btn-danger">
-                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
-                </a>
-            {% endif %}
-            {% if termination %}
-            <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
-                <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
-            </a>
-            {% endif %}
-        </div>
+        {% include 'circuits/inc/circuit_termination_header_extra_content.html' with termination=termination %}
         <strong>Termination - {{ side }} Side</strong>
     </div>
     {% if termination %}
@@ -41,45 +21,7 @@
             <tr>
                 <td>Cable</td>
                 <td>
-                    {% if termination.cable %}
-                        {% if perms.dcim.delete_cable %}
-                            <div class="pull-right">
-                                <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-xs">
-                                    <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
-                                </a>
-                            </div>
-                        {% endif %}
-                        {{ termination.cable|hyperlinked_object }}
-                        <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                            <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
-                        </a>
-                        {% with peer=termination.get_cable_peer %}
-                            to
-                            {% if peer.device %}
-                                {{ peer.device|hyperlinked_object }}
-                            {% elif peer.circuit %}
-                                {{ peer.circuit|hyperlinked_object }}
-                            {% endif %}
-                            ({{ peer }})
-                        {% endwith %}
-                    {% else %}
-                        {% if perms.dcim.add_cable %}
-                            <div class="pull-right">
-                                <span class="dropdown">
-                                    <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
-                                    </button>
-                                    <ul class="dropdown-menu dropdown-menu-right">
-                                        <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
-                                        <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                                        <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                                        <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
-                                    </ul>
-                                </span>
-                            </div>
-                        {% endif %}
-                        <span class="text-muted">Not defined</span>
-                    {% endif %}
+                    {% include 'circuits/inc/circuit_termination_cable_fragment.html' %}
                 </td>
             </tr>
             {% elif termination.provider_network %}

nautobot/circuits/templates/circuits/inc/circuit_termination_cable_fragment.html

@@ -0,0 +1,40 @@
+{% load helpers %}
+{% if termination.cable %}
+    {% if perms.dcim.delete_cable %}
+        <div class="pull-right">
+            <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-xs">
+                <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
+            </a>
+        </div>
+    {% endif %}
+    {{ termination.cable|hyperlinked_object }}
+    <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-xs" title="Trace">
+        <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
+    </a>
+    {% with peer=termination.get_cable_peer %}
+        to
+        {% if peer.device %}
+            {{ peer.device|hyperlinked_object }}
+        {% elif peer.circuit %}
+            {{ peer.circuit|hyperlinked_object }}
+        {% endif %}
+        ({{ peer }})
+    {% endwith %}
+{% else %}
+    {% if perms.dcim.add_cable %}
+        <div class="pull-right">
+            <span class="dropdown">
+                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
+                </button>
+                <ul class="dropdown-menu dropdown-menu-right">
+                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
+                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                    <li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_location={{ termination.location.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
+                </ul>
+            </span>
+        </div>
+    {% endif %}
+    <span class="text-muted">Not defined</span>
+{% endif %}

nautobot/circuits/templates/circuits/inc/circuit_termination_header_extra_content.html

@@ -0,0 +1,26 @@
+{% load helpers %}
+<div class="pull-right">
+    {% if not termination and perms.circuits.add_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_add' circuit=object.pk %}?term_side={{ side }}" class="btn btn-xs btn-success">
+            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add
+        </a>
+    {% endif %}
+    {% if termination and perms.circuits.change_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-xs btn-warning">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+        </a>
+        <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}" class="btn btn-xs btn-primary">
+            <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> Swap
+        </a>
+    {% endif %}
+    {% if termination and perms.circuits.delete_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-xs btn-danger">
+            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
+        </a>
+    {% endif %}
+    {% if termination %}
+    <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
+        <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
+    </a>
+    {% endif %}
+</div>

nautobot/circuits/templates/circuits/provider_retrieve.html

@@ -1,77 +1 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Provider</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>ASN</td>
-                    <td>{{ object.asn|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Account</td>
-                    <td>{{ object.account|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Customer Portal</td>
-                    <td>
-                        {% if object.portal_url %}
-                            <a href="{{ object.portal_url }}">{{ object.portal_url }}</a>
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>NOC Contact</td>
-                    <td class="rendered-markdown">{{ object.noc_contact|render_markdown|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Admin Contact</td>
-                    <td class="rendered-markdown">{{ object.admin_contact|render_markdown|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Circuits</td>
-                    <td>
-                        <a href="{% url 'circuits:circuit_list' %}?provider={{ object.pk }}">{{ circuits_table.rows|length }}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <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_right_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuits</strong>
-            </div>
-            {% include 'inc/table.html' with table=circuits_table %}
-            {% if perms.circuits.add_circuit %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'circuits:circuit_add' %}?provider={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add circuit
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-        <div class="row"></div>
-{% endblock content_full_width_page %}

nautobot/circuits/tests/integration/test_relationships.py

@@ -26,17 +26,18 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
         power_panel_ct = ContentType.objects.get_for_model(PowerPanel)
         circuit_status = Status.objects.get_for_model(Circuit).first()
         location_status = Status.objects.get_for_model(Location).first()
-        provider1 = Provider.objects.create(
-            name="A Test Provider 1",
-        )
-        provider2 = Provider.objects.create(
-            name="A Test Provider 2",
-        )
+        providers = [
+            Provider.objects.create(name="A Test Provider 1"),
+            Provider.objects.create(name="A Test Provider 2"),
+            Provider.objects.create(name="A Test Provider 3"),
+            Provider.objects.create(name="A Test Provider 4"),
+            Provider.objects.create(name="A Test Provider 5"),
+        ]
         circuit_type = CircuitType.objects.create(
             name="A Test Circuit Type",
         )
         circuit = Circuit.objects.create(
-            provider=provider1,
+            provider=providers[0],
             cid="123456789",
             circuit_type=circuit_type,
             status=circuit_status,
@@ -62,19 +63,15 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
             destination_type=provider_ct,
             type=RelationshipTypeChoices.TYPE_MANY_TO_MANY,
         )
-        RelationshipAssociation.objects.create(
-            relationship=m2m,
-            source=circuit_termination,
-            destination=provider1,
-        )
-        RelationshipAssociation.objects.create(
-            relationship=m2m,
-            source=circuit_termination,
-            destination=provider2,
-        )
+        for provider in providers:
+            RelationshipAssociation.objects.create(
+                relationship=m2m,
+                source=circuit_termination,
+                destination=provider,
+            )
         o2m = Relationship.objects.create(
             label="Termination 2 Location o2m",
-            key="termination_2_provider_o2m",
+            key="termination_2_location_o2m",
             source_type=circuit_termination_ct,
             destination_type=location_ct,
             type=RelationshipTypeChoices.TYPE_ONE_TO_MANY,
@@ -115,9 +112,10 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
         self.logout()
         super().tearDown()
 
-    def test_relationships_are_visible(self):
+    # TODO: this really doesn't need to be an integration test, it could *easily* be done as a pure unit test
+    def test_termination_relationships_are_visible(self):
         """
-        Navigate to the circuit created in setUp() and check that the relationships are showing on the page
+        Navigate to the circuit created in setUp() and check that the termination relationships are showing on the page.
         """
         self.browser.visit(self.live_server_url)
 
@@ -130,8 +128,19 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
         # Click on the circuit link (circuit created in setUp)
         self.browser.links.find_by_partial_text("123456789").click()
 
-        # Verify custom relationships are visible
+        # Verify custom relationships on the circuit terminations are visible
+        # One-to-one relationship
+        self.assertTrue(self.browser.is_text_present("Power Panel"))
         self.assertTrue(self.browser.is_text_present("Test Power Panel"))
-        self.assertTrue(self.browser.is_text_present("2 providers"))
-        self.assertTrue(self.browser.is_text_present("1 location"))
-        self.assertTrue(self.browser.is_text_present("1 nonexistentmodel(s)"))
+        # Many-to-many relationship
+        self.assertTrue(self.browser.is_text_present("Providers"))
+        self.assertTrue(self.browser.is_text_present("A Test Provider 1"))
+        self.assertTrue(self.browser.is_text_present("A Test Provider 2"))
+        self.assertTrue(self.browser.is_text_present("A Test Provider 3"))
+        self.assertTrue(self.browser.is_text_present("2 other providers"))
+        # One-to-many relationship
+        self.assertTrue(self.browser.is_text_present("Locations"))
+        self.assertTrue(self.browser.is_text_present("A Test Location"))
+        # Error handling (#2077)
+        self.assertTrue(self.browser.is_text_present("Termination 2 Nonexistent"))
+        self.assertTrue(self.browser.is_text_present("1 nonexistentmodel object(s)"))

nautobot/circuits/tests/test_filters.py

@@ -15,7 +15,7 @@ from nautobot.dcim.models import Cable, Device, DeviceType, Interface, Location
 from nautobot.extras.models import Role, Status, Tag
 
 
-class ProviderTestCase(FilterTestCases.NameOnlyFilterTestCase, FilterTestCases.FilterTestCase):
+class ProviderTestCase(FilterTestCases.FilterTestCase):
     queryset = Provider.objects.all()
     filterset = ProviderFilterSet
 
@@ -26,6 +26,7 @@ class ProviderTestCase(FilterTestCases.NameOnlyFilterTestCase, FilterTestCases.F
         ["circuits", "circuits__id"],
         ["circuits", "circuits__cid"],
         ["comments"],
+        ["name"],
         ["noc_contact"],
         ["portal_url"],
         ["provider_networks", "provider_networks__id"],
@@ -64,7 +65,7 @@ class ProviderTestCase(FilterTestCases.NameOnlyFilterTestCase, FilterTestCases.F
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, expected)
 
 
-class CircuitTypeTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class CircuitTypeTestCase(FilterTestCases.FilterTestCase):
     queryset = CircuitType.objects.all()
     filterset = CircuitTypeFilterSet
 
@@ -118,11 +119,6 @@ class CircuitTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFil
         params = {"location": [locations[0].name, locations[1].name]}
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, expected)
 
-    def test_search(self):
-        value = self.queryset.values_list("pk", flat=True)[0]
-        params = {"q": value}
-        self.assertEqual(self.filterset(params, self.queryset).qs.values_list("pk", flat=True)[0], value)
-
 
 class CircuitTerminationTestCase(FilterTestCases.FilterTestCase):
     queryset = CircuitTermination.objects.all()
@@ -203,7 +199,7 @@ class CircuitTerminationTestCase(FilterTestCases.FilterTestCase):
         self.assertQuerysetEqualAndNotEmpty(filterset_result, qs_result)
 
 
-class ProviderNetworkTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class ProviderNetworkTestCase(FilterTestCases.FilterTestCase):
     queryset = ProviderNetwork.objects.all()
     filterset = ProviderNetworkFilterSet