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

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
 

nautobot/circuits/views.py

@@ -2,9 +2,18 @@ from django.contrib import messages
 from django.db import transaction
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.html import format_html
 from django_tables2 import RequestConfig
 
 from nautobot.core.forms import ConfirmationForm
+from nautobot.core.templatetags.helpers import bettertitle, humanize_speed, placeholder
+from nautobot.core.ui.choices import SectionChoices
+from nautobot.core.ui.object_detail import (
+    ObjectDetailContent,
+    ObjectFieldsPanel,
+    ObjectsTablePanel,
+)
+from nautobot.core.ui.utils import render_component_template
 from nautobot.core.views import generic, mixins as view_mixins
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.viewsets import NautobotUIViewSet
@@ -79,11 +88,11 @@ class CircuitTerminationUIViewSet(
             obj.circuit = get_object_or_404(Circuit, pk=self.kwargs["circuit"])
         return obj
 
-    def get_return_url(self, request, obj=None, default_return_url=None):
+    def get_return_url(self, request, obj=None):
         if obj is not None and obj.present_in_database and obj.pk:
-            return super().get_return_url(request, obj=obj.circuit, default_return_url=default_return_url)
+            return super().get_return_url(request, obj=obj.circuit)
 
-        return super().get_return_url(request, obj=obj, default_return_url=default_return_url)
+        return super().get_return_url(request, obj=obj)
 
 
 class ProviderUIViewSet(NautobotUIViewSet):
@@ -94,27 +103,22 @@ class ProviderUIViewSet(NautobotUIViewSet):
     queryset = Provider.objects.all()
     serializer_class = serializers.ProviderSerializer
     table_class = tables.ProviderTable
-
-    def get_extra_context(self, request, instance):
-        context = super().get_extra_context(request, instance)
-        if self.action == "retrieve":
-            circuits = (
-                Circuit.objects.restrict(request.user, "view")
-                .filter(provider=instance)
-                .select_related("circuit_type", "tenant")
-                .prefetch_related("circuit_terminations__location")
-            )
-            circuits_table = tables.CircuitTable(circuits)
-            circuits_table.columns.hide("provider")
-
-            paginate = {
-                "paginator_class": EnhancedPaginator,
-                "per_page": get_paginate_count(request),
-            }
-            RequestConfig(request, paginate).configure(circuits_table)
-
-            context["circuits_table"] = circuits_table
-        return context
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+            ),
+            ObjectsTablePanel(
+                weight=200,
+                table_class=tables.CircuitTable,
+                table_filter="provider",
+                section=SectionChoices.FULL_WIDTH,
+                exclude_columns=["provider"],
+            ),
+        ),
+    )
 
 
 class CircuitUIViewSet(NautobotUIViewSet):
@@ -127,8 +131,121 @@ class CircuitUIViewSet(NautobotUIViewSet):
     queryset = Circuit.objects.all()
     serializer_class = serializers.CircuitSerializer
     table_class = tables.CircuitTable
-    # NOTE: This is how `NautobotUIViewSet` would define use_new_ui attr
-    # use_new_ui = ["list", "retrieve"]
+
+    class CircuitTerminationPanel(ObjectFieldsPanel):
+        def __init__(self, **kwargs):
+            super().__init__(
+                fields=(
+                    "location",  # TODO: render location hierarchy
+                    "cable",
+                    "provider_network",
+                    "cloud_network",
+                    "port_speed",
+                    "upstream_speed",
+                    "ip_addresses",
+                    "xconnect_id",
+                    "pp_info",
+                    "description",
+                ),
+                value_transforms={
+                    "port_speed": [humanize_speed, placeholder],
+                    "upstream_speed": [humanize_speed],
+                },
+                hide_if_unset=("location", "provider_network", "cloud_network", "upstream_speed"),
+                ignore_nonexistent_fields=True,  # ip_addresses may be undefined
+                header_extra_content_template_path="circuits/inc/circuit_termination_header_extra_content.html",
+                **kwargs,
+            )
+
+        def should_render(self, context):
+            return True
+
+        def get_extra_context(self, context):
+            return {"termination": context[self.context_object_key]}
+
+        def get_data(self, context):
+            """
+            Extend the panel data to include custom relationships on the termination.
+
+            This is done for feature parity with the existing UI, and is not a pattern we *generally* should emulate.
+            """
+            data = super().get_data(context)
+            termination = context["termination"]
+            if termination is not None:
+                for side, relationships in termination.get_relationships_with_related_objects(
+                    include_hidden=False
+                ).items():
+                    for relationship, value in relationships.items():
+                        key = (relationship, side)
+                        data[key] = value
+
+            return data
+
+        def render_key(self, key, value, context):
+            """
+            Extend the panel rendering to render custom relationship information.
+
+            This is done for feature parity with the existing UI, and is not a pattern we *generally* should emulate.
+            """
+            if isinstance(key, tuple):
+                # Copied from _ObjectRelationshipsPanel.render_key()
+                relationship, side = key
+                return format_html(
+                    '<span title="{} ({})">{}</span>',
+                    relationship.label,
+                    relationship.key,
+                    bettertitle(relationship.get_label(side)),
+                )
+            return super().render_key(key, value, context)
+
+        def render_value(self, key, value, context):
+            """
+            Add custom rendering of connected cables.
+
+            TODO: this might make sense to move into the base class to handle Cable objects in general?
+            """
+            if key == "cable":
+                if not context["termination"].location:
+                    return ""
+                return render_component_template("circuits/inc/circuit_termination_cable_fragment.html", context)
+            return super().render_value(key, value, context)
+
+        def queryset_list_url_filter(self, key, value, context):
+            """
+            Extend the panel rendering to render custom relationship information.
+
+            This is done for feature parity with the existing UI, and is not a pattern we *generally* should emulate.
+            """
+            if isinstance(key, tuple):
+                # Copied from _ObjectRelationshipsPanel.queryset_list_url_filter()
+                relationship, side = key
+                termination = context["termination"]
+                return f"cr_{relationship.key}__{side}={termination.pk}"
+            return super().queryset_list_url_filter(key, value, context)
+
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            ObjectFieldsPanel(
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+                fields="__all__",
+                exclude_fields=["comments", "circuit_termination_a", "circuit_termination_z"],
+                value_transforms={"commit_rate": [humanize_speed, placeholder]},
+            ),
+            CircuitTerminationPanel(
+                label="Termination - A Side",
+                section=SectionChoices.RIGHT_HALF,
+                weight=100,
+                context_object_key="circuit_termination_a",
+            ),
+            CircuitTerminationPanel(
+                label="Termination - Z Side",
+                section=SectionChoices.RIGHT_HALF,
+                weight=200,
+                context_object_key="circuit_termination_z",
+            ),
+        ),
+    )
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)

nautobot/cloud/factory.py

@@ -86,7 +86,10 @@ class CloudNetworkFactory(PrimaryModelFactory):
             if extracted:
                 self.prefixes.set(extracted)
             else:
-                self.prefixes.set(get_random_instances(Prefix))
+                # TODO Investigate https://github.com/nautobot/nautobot/actions/runs/11019738391/job/30603271529
+                # to uncomment the line below.
+                # self.prefixes.set(get_random_instances(Prefix))
+                self.prefixes.set(get_random_instances(model_or_queryset_or_lambda=Prefix, maximum=1))
 
 
 class CloudServiceFactory(PrimaryModelFactory):

nautobot/cloud/models.py

@@ -109,7 +109,7 @@ class CloudResourceTypeMixin(models.Model):
         super().clean()
 
         # Copied from nautobot.extras.models.models.ConfigContextSchemaValidationMixin
-        schema = self.cloud_resource_type.config_schema  # pylint: disable=no-member
+        schema = self.cloud_resource_type.config_schema
         if schema:
             try:
                 Draft7Validator(schema, format_checker=Draft7Validator.FORMAT_CHECKER).validate(self.extra_config)

nautobot/cloud/tests/test_filters.py

@@ -5,12 +5,13 @@ from nautobot.core.testing import FilterTestCases
 from nautobot.extras.models import SecretsGroup
 
 
-class CloudAccountTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class CloudAccountTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudAccount.objects.all()
     filterset = filters.CloudAccountFilterSet
     generic_filter_tests = [
         ("account_number",),
         ("description",),
+        ("name",),
         ("provider", "provider__id"),
         ("provider", "provider__name"),
         ("secrets_group", "secrets_group__id"),
@@ -31,7 +32,7 @@ class CloudAccountTestCase(FilterTestCases.NameOnlyFilterTestCase):
             cls.cloud_accounts[i].validated_save()
 
 
-class CloudResourceTypeTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class CloudResourceTypeTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudResourceType.objects.all()
     filterset = filters.CloudResourceTypeFilterSet
     generic_filter_tests = [
@@ -50,7 +51,7 @@ class CloudResourceTypeTestCase(FilterTestCases.NameOnlyFilterTestCase):
         )
 
 
-class CloudNetworkTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class CloudNetworkTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudNetwork.objects.all()
     filterset = filters.CloudNetworkFilterSet
     generic_filter_tests = [
@@ -110,7 +111,7 @@ class CloudServiceNetworkAssignmentTestCase(FilterTestCases.FilterTestCase):
     ]
 
 
-class CloudServiceTestCase(FilterTestCases.NameOnlyFilterTestCase):
+class CloudServiceTestCase(FilterTestCases.FilterTestCase):
     queryset = models.CloudService.objects.all()
     filterset = filters.CloudServiceFilterSet
     generic_filter_tests = [

nautobot/core/api/fields.py

@@ -53,10 +53,10 @@ class ChoiceField(serializers.Field):
                 data = ""
         return super().validate_empty_values(data)
 
-    def to_representation(self, value):
-        if value == "":
+    def to_representation(self, obj):
+        if obj == "":
             return None
-        return OrderedDict([("value", value), ("label", self._choices[value])])
+        return OrderedDict([("value", obj), ("label", self._choices[obj])])
 
     def to_internal_value(self, data):
         if data == "":
@@ -123,8 +123,8 @@ class ContentTypeField(RelatedField):
             self.fail("invalid")
         return None
 
-    def to_representation(self, value):
-        return f"{value.app_label}.{value.model}"
+    def to_representation(self, obj):
+        return f"{obj.app_label}.{obj.model}"
 
 
 class LaxURLField(URLField):