nautobot 2.0.0a2__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/circuits/tests/test_api.py

@@ -17,46 +17,29 @@ class AppTest(APITestCase):
 
 class ProviderTest(APIViewTestCases.APIViewTestCase):
     model = Provider
-    brief_fields = ["circuit_count", "display", "id", "name", "slug", "url"]
     create_data = [
         {
             "name": "Provider 4",
-            "slug": "provider-4",
         },
         {
             "name": "Provider 5",
-            "slug": "provider-5",
         },
         {
             "name": "Provider 6",
-            "slug": "provider-6",
         },
         {"name": "Provider 7"},
     ]
     bulk_update_data = {
         "asn": 1234,
     }
-    slug_source = "name"
-
-    @classmethod
-    def setUpTestData(cls):
-
-        Provider.objects.create(name="Provider 1", slug="provider-1")
-        Provider.objects.create(name="Provider 2", slug="provider-2")
-        Provider.objects.create(name="Provider 3", slug="provider-3")
 
 
 class ProviderNetworkTest(APIViewTestCases.APIViewTestCase):
     model = ProviderNetwork
-    brief_fields = ["display", "id", "name", "slug", "url"]
 
     @classmethod
     def setUpTestData(cls):
-        providers = (
-            Provider(name="Provider 1", slug="provider-1"),
-            Provider(name="Provider 2", slug="provider-2"),
-        )
-        Provider.objects.bulk_create(providers)
+        providers = Provider.objects.all()[:2]
 
         provider_networks = (
             ProviderNetwork(name="Provider Network 1", slug="provider-network-1", provider=providers[0]),
@@ -91,51 +74,38 @@ class ProviderNetworkTest(APIViewTestCases.APIViewTestCase):
 
 class CircuitTypeTest(APIViewTestCases.APIViewTestCase):
     model = CircuitType
-    brief_fields = ["circuit_count", "display", "id", "name", "slug", "url"]
     create_data = (
         {
             "name": "Circuit Type 4",
-            "slug": "circuit-type-4",
         },
         {
             "name": "Circuit Type 5",
-            "slug": "circuit-type-5",
         },
         {
             "name": "Circuit Type 6",
-            "slug": "circuit-type-6",
         },
         {"name": "Circuit Type 7"},
     )
     bulk_update_data = {
         "description": "New description",
     }
-    slug_source = "name"
 
     @classmethod
     def setUpTestData(cls):
-
-        CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1")
-        CircuitType.objects.create(name="Circuit Type 2", slug="circuit-type-2")
-        CircuitType.objects.create(name="Circuit Type 3", slug="circuit-type-3")
+        # TODO: There is not enough CircuitTypes without associated Circuits for test_bulk_delete to jus work
+        CircuitType.objects.create(name="Circuit Type 1")
+        CircuitType.objects.create(name="Circuit Type 2")
+        CircuitType.objects.create(name="Circuit Type 3")
 
 
 class CircuitTest(APIViewTestCases.APIViewTestCase):
     model = Circuit
-    brief_fields = ["cid", "display", "id", "url"]
 
     @classmethod
     def setUpTestData(cls):
+        providers = Provider.objects.all()[:2]
 
-        providers = (
-            Provider.objects.create(name="Provider 1", slug="provider-1"),
-            Provider.objects.create(name="Provider 2", slug="provider-2"),
-        )
-
-        circuit_types = (
-            CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1"),
-            CircuitType.objects.create(name="Circuit Type 2", slug="circuit-type-2"),
-        )
+        circuit_types = CircuitType.objects.all()[:2]
 
         statuses = Status.objects.get_for_model(Circuit)
 
@@ -186,7 +156,6 @@ class CircuitTest(APIViewTestCases.APIViewTestCase):
 
 class CircuitTerminationTest(APIViewTestCases.APIViewTestCase):
     model = CircuitTermination
-    brief_fields = ["cable", "circuit", "display", "id", "term_side", "url"]
     choices_fields = ["term_side"]
 
     @classmethod
@@ -199,13 +168,14 @@ class CircuitTerminationTest(APIViewTestCases.APIViewTestCase):
             Location.objects.last(),
         )
 
-        provider = Provider.objects.create(name="Provider 1", slug="provider-1")
-        circuit_type = CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1")
+        provider = Provider.objects.first()
+        circuit_type = CircuitType.objects.first()
+        status = Status.objects.get_for_model(Circuit).first()
 
         circuits = (
-            Circuit.objects.create(cid="Circuit 1", provider=provider, circuit_type=circuit_type),
-            Circuit.objects.create(cid="Circuit 2", provider=provider, circuit_type=circuit_type),
-            Circuit.objects.create(cid="Circuit 3", provider=provider, circuit_type=circuit_type),
+            Circuit.objects.create(cid="Circuit 1", provider=provider, circuit_type=circuit_type, status=status),
+            Circuit.objects.create(cid="Circuit 2", provider=provider, circuit_type=circuit_type, status=status),
+            Circuit.objects.create(cid="Circuit 3", provider=provider, circuit_type=circuit_type, status=status),
         )
 
         CircuitTermination.objects.create(circuit=circuits[0], location=locations[0], term_side=SIDE_A)

nautobot/circuits/tests/test_filters.py

@@ -12,10 +12,10 @@ from nautobot.circuits.filters import (
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.testing import FilterTestCases
 from nautobot.dcim.models import Cable, Device, DeviceType, Interface, Location
-from nautobot.extras.models import Role, Status
+from nautobot.extras.models import Role, Status, Tag
 
 
-class ProviderTestCase(FilterTestCases.NameSlugFilterTestCase):
+class ProviderTestCase(FilterTestCases.NameOnlyFilterTestCase):
     queryset = Provider.objects.all()
     filterset = ProviderFilterSet
 
@@ -34,14 +34,19 @@ class ProviderTestCase(FilterTestCases.NameSlugFilterTestCase):
 
     @classmethod
     def setUpTestData(cls):
-
         providers = Provider.objects.all()[:2]
+        providers[0].tags.set(Tag.objects.get_for_model(Provider))
         circuit_types = CircuitType.objects.all()[:2]
         cls.locations = Location.objects.filter(children__isnull=True)[:2]
 
+        status = Status.objects.get_for_model(Circuit).first()
         circuits = (
-            Circuit.objects.create(provider=providers[0], circuit_type=circuit_types[0], cid="Test Circuit 1"),
-            Circuit.objects.create(provider=providers[1], circuit_type=circuit_types[1], cid="Test Circuit 1"),
+            Circuit.objects.create(
+                provider=providers[0], circuit_type=circuit_types[0], cid="Test Circuit 1", status=status
+            ),
+            Circuit.objects.create(
+                provider=providers[1], circuit_type=circuit_types[1], cid="Test Circuit 1", status=status
+            ),
         )
 
         CircuitTermination.objects.create(circuit=circuits[0], location=cls.locations[0], term_side="A")
@@ -59,14 +64,13 @@ class ProviderTestCase(FilterTestCases.NameSlugFilterTestCase):
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, expected)
 
 
-class CircuitTypeTestCase(FilterTestCases.NameSlugFilterTestCase):
+class CircuitTypeTestCase(FilterTestCases.NameOnlyFilterTestCase):
     queryset = CircuitType.objects.all()
     filterset = CircuitTypeFilterSet
 
     generic_filter_tests = (
         ["description"],
         ["name"],
-        ["slug"],
     )
 
 
@@ -82,12 +86,12 @@ class CircuitTestCase(FilterTestCases.FilterTestCase, FilterTestCases.TenancyFil
         ["install_date"],
         ["commit_rate"],
         ["provider", "provider__id"],
-        ["provider", "provider__slug"],
+        ["provider", "provider__name"],
         ["provider_network", "circuit_terminations__provider_network__id"],
         ["provider_network", "circuit_terminations__provider_network__slug"],
         ["circuit_type", "circuit_type__id"],
-        ["circuit_type", "circuit_type__slug"],
-        ["status", "status__slug"],
+        ["circuit_type", "circuit_type__name"],
+        ["status", "status__name"],
         ["circuit_termination_a"],
         ["circuit_termination_z"],
         ["circuit_terminations"],
@@ -151,13 +155,15 @@ class CircuitTerminationTestCase(FilterTestCases.FilterTestCase):
             status=device_status,
             location=location,
         )
-        interface1 = Interface.objects.create(device=device1, name="eth0")
-        interface2 = Interface.objects.create(device=device2, name="eth0")
+        interface_status = Status.objects.get_for_model(Interface).first()
+        interface1 = Interface.objects.create(device=device1, name="eth0", status=interface_status)
+        interface2 = Interface.objects.create(device=device2, name="eth0", status=interface_status)
 
         circuit_terminations = CircuitTermination.objects.all()
+        circuit_terminations[0].tags.set(Tag.objects.get_for_model(CircuitTermination))
 
         cable_statuses = Status.objects.get_for_model(Cable)
-        status_connected = cable_statuses.get(slug="connected")
+        status_connected = cable_statuses.get(name="Connected")
 
         Cable.objects.create(
             termination_a=circuit_terminations[0],
@@ -199,6 +205,5 @@ class ProviderNetworkTestCase(FilterTestCases.NameSlugFilterTestCase):
         ["description"],
         ["name"],
         ["provider", "provider__id"],
-        ["provider", "provider__slug"],
-        ["slug"],
+        ["provider", "provider__name"],
     )

nautobot/circuits/tests/test_models.py

@@ -5,6 +5,7 @@ from nautobot.circuits.choices import CircuitTerminationSideChoices
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.dcim.models import Location, LocationType
+from nautobot.extras.models import Status
 
 
 class CircuitTerminationModelTestCase(ModelTestCases.BaseModelTestCase):
@@ -12,14 +13,17 @@ class CircuitTerminationModelTestCase(ModelTestCases.BaseModelTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        provider = Provider.objects.create(name="Provider 1", slug="provider-1")
-        circuit_type = CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1")
+        provider = Provider.objects.first()
+        circuit_type = CircuitType.objects.first()
 
         location_type_1 = LocationType.objects.get(name="Campus")
         location_type_1.content_types.set([])
         location_type_2 = LocationType.objects.get(name="Building")
         location_type_2.content_types.add(ContentType.objects.get_for_model(CircuitTermination))
-        cls.circuit = Circuit.objects.create(cid="Circuit 1", provider=provider, circuit_type=circuit_type)
+        status = Status.objects.get_for_model(Circuit).first()
+        cls.circuit = Circuit.objects.create(
+            cid="Circuit 1", provider=provider, circuit_type=circuit_type, status=status
+        )
         cls.provider_network = ProviderNetwork.objects.create(name="Provider Network 1", provider=provider)
         cls.location_1 = Location.objects.filter(location_type=location_type_1)[0]
         cls.location_2 = Location.objects.filter(location_type=location_type_2)[0]

nautobot/circuits/tests/test_views.py

@@ -10,6 +10,7 @@ from nautobot.circuits.models import (
     ProviderNetwork,
 )
 from nautobot.core.testing import post_data, TestCase as NautobotTestCase, ViewTestCases
+from nautobot.dcim.models import Location
 from nautobot.extras.models import Status, Tag
 
 
@@ -18,15 +19,8 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-
-        Provider.objects.create(name="Provider 1", slug="provider-1", asn=65001)
-        Provider.objects.create(name="Provider 2", slug="provider-2", asn=65002)
-        Provider.objects.create(name="Provider 3", slug="provider-3", asn=65003)
-        Provider.objects.create(name="Provider 8", asn=65003)
-
         cls.form_data = {
             "name": "Provider X",
-            "slug": "provider-x",
             "asn": 65123,
             "account": "this-is-a-long-account-number-012345678901234567890123456789",
             "portal_url": "http://example.com/portal",
@@ -37,11 +31,11 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
         cls.csv_data = (
-            "name,slug",
-            "Provider 4,provider-4",
-            "Provider 5,provider-5",
-            "Provider 6,provider-6",
-            "Provider 7,",
+            "name,asn,comments",
+            "Provider 4,1234,A comment",
+            "Provider 5,1234,A comment",
+            "Provider 6,1234,A comment",
+            "Provider 7,1234,A comment",
         )
 
         cls.bulk_edit_data = {
@@ -53,54 +47,34 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "comments": "New comments",
         }
 
-        cls.slug_source = "name"
-        cls.slug_test_object = "Provider 8"
-
 
 class CircuitTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = CircuitType
 
     @classmethod
     def setUpTestData(cls):
-
-        CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1")
-        CircuitType.objects.create(name="Circuit Type 2", slug="circuit-type-2")
-        CircuitType.objects.create(name="Circuit Type 3", slug="circuit-type-3")
-        CircuitType.objects.create(name="Circuit Type 8")
-
         cls.form_data = {
             "name": "Circuit Type X",
-            "slug": "circuit-type-x",
             "description": "A new circuit type",
         }
 
         cls.csv_data = (
-            "name,slug",
-            "Circuit Type 4,circuit-type-4",
-            "Circuit Type 5,circuit-type-5",
-            "Circuit Type 6,circuit-type-6",
-            "Circuit Type 7,",
+            "name,description",
+            "Circuit Type 4,A circuit type",
+            "Circuit Type 5,A circuit type",
+            "Circuit Type 6,A circuit type",
+            "Circuit Type 7,A circuit type",
         )
 
-        cls.slug_source = "name"
-        cls.slug_test_object = "Circuit Type 8"
-
 
 class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Circuit
 
     @classmethod
     def setUpTestData(cls):
+        providers = Provider.objects.all()[:2]
 
-        providers = (
-            Provider.objects.create(name="Provider 1", slug="provider-1", asn=65001),
-            Provider.objects.create(name="Provider 2", slug="provider-2", asn=65002),
-        )
-
-        circuittypes = (
-            CircuitType.objects.create(name="Circuit Type 1", slug="circuit-type-1"),
-            CircuitType.objects.create(name="Circuit Type 2", slug="circuit-type-2"),
-        )
+        circuittypes = CircuitType.objects.all()[:2]
 
         statuses = Status.objects.get_for_model(Circuit)
 
@@ -127,7 +101,7 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "cid": "Circuit X",
             "provider": providers[1].pk,
             "circuit_type": circuittypes[1].pk,
-            "status": statuses.get(slug="decommissioned").pk,
+            "status": statuses.last().pk,
             "tenant": None,
             "install_date": datetime.date(2020, 1, 1),
             "commit_rate": 1000,
@@ -138,15 +112,15 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
         cls.csv_data = (
             "cid,provider,circuit_type,status",
-            "Circuit 4,Provider 1,Circuit Type 1,active",
-            "Circuit 5,Provider 1,Circuit Type 1,planned",
-            "Circuit 6,Provider 1,Circuit Type 1,decommissioned",
+            f'Circuit 4,"{providers[0].name}",{circuittypes[0].name},{statuses.first().name}',
+            f'Circuit 5,"{providers[0].name}",{circuittypes[1].name},{statuses.first().name}',
+            f'Circuit 6,"{providers[1].name}",{circuittypes[1].name},{statuses.first().name}',
         )
 
         cls.bulk_edit_data = {
             "provider": providers[1].pk,
             "circuit_type": circuittypes[1].pk,
-            "status": statuses.get(slug="decommissioned").pk,
+            "status": statuses.last().pk,
             "tenant": None,
             "commit_rate": 2000,
             "description": "New description",
@@ -159,12 +133,7 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-
-        providers = (
-            Provider(name="Provider 1", slug="provider-1"),
-            Provider(name="Provider 2", slug="provider-2"),
-        )
-        Provider.objects.bulk_create(providers)
+        providers = Provider.objects.all()[:2]
 
         ProviderNetwork.objects.bulk_create(
             [
@@ -186,10 +155,10 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
         cls.csv_data = (
             "name,slug,provider,description",
-            "Provider Network 4,provider-network-4,Provider 1,Foo",
-            "Provider Network 5,provider-network-5,Provider 1,Bar",
-            "Provider Network 6,provider-network-6,Provider 1,Baz",
-            "Provider Network 7,,Provider 1,Baz",
+            f'Provider Network 4,provider-network-4,"{providers[0].name}",Foo',
+            f'Provider Network 5,provider-network-5,"{providers[0].name}",Bar',
+            f'Provider Network 6,provider-network-6,"{providers[0].name}",Baz',
+            f'Provider Network 7,,"{providers[0].name}",Baz',
         )
 
         cls.bulk_edit_data = {
@@ -202,32 +171,53 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.slug_source = "name"
 
 
-class CircuitTerminationTestCase(NautobotTestCase):
-    def setUp(self):
-        super().setUp()
-        self.user.is_superuser = True
-        self.user.save()
+class CircuitTerminationTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
+    ViewTestCases.GetObjectNotesViewTestCase,
+    # create/edit views are special cases, not currently tested
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkImportObjectsViewTestCase,
+    # No bulk-edit support currently
+    ViewTestCases.BulkDeleteObjectsViewTestCase,
+):
+    model = CircuitTermination
+
+    @classmethod
+    def setUpTestData(cls):
+        circuit = Circuit.objects.filter(circuit_terminations__isnull=True).first()
+        provider_network = ProviderNetwork.objects.filter(circuit_terminations__isnull=True).first()
+        location = Location.objects.get_for_model(CircuitTermination).first()
+
+        cls.csv_data = (
+            "term_side,circuit,location,provider_network,port_speed",
+            f"A,{circuit.natural_key_slug},{location.natural_key_slug}",
+            f"Z,{circuit.natural_key_slug},,{provider_network.natural_key_slug},1000",
+        )
 
     def test_circuit_termination_detail_200(self):
         """
         This tests that a circuit termination's detail page (with a provider
         network instead of a site) returns a 200 response and doesn't contain the connect menu button.
         """
+        self.user.is_superuser = True
+        self.user.save()
 
         # Set up the required objects:
-        provider = Provider.objects.create(name="Test Provider", slug="test-provider", asn=12345)
+        provider = Provider.objects.first()
         provider_network = ProviderNetwork.objects.create(
             name="Test Provider Network",
             slug="test-provider-network",
             provider=provider,
         )
-        circuit_type = CircuitType.objects.create(name="Test Circuit Type", slug="test-circuit-type")
-        active_status = Status.objects.get_for_model(Circuit).get(slug="active")
+        circuit_type = CircuitType.objects.first()
+        status = Status.objects.get_for_model(Circuit).first()
         circuit = Circuit.objects.create(
             cid="Test Circuit",
             provider=provider,
             circuit_type=circuit_type,
-            status=active_status,
+            status=status,
         )
         termination = CircuitTermination.objects.create(
             circuit=circuit, provider_network=provider_network, term_side=CircuitTerminationSideChoices.SIDE_A
@@ -252,7 +242,7 @@ class CircuitSwapTerminationsTestCase(NautobotTestCase):
 
     def test_swap_circuit_termination(self):
         # Set up the required objects:
-        provider = Provider.objects.create(name="Test Provider", slug="test-provider", asn=12345)
+        provider = Provider.objects.first()
         provider_networks = (
             ProviderNetwork.objects.create(
                 name="Test Provider Network 1",
@@ -265,13 +255,13 @@ class CircuitSwapTerminationsTestCase(NautobotTestCase):
                 provider=provider,
             ),
         )
-        circuit_type = CircuitType.objects.create(name="Test Circuit Type", slug="test-circuit-type")
-        active_status = Status.objects.get_for_model(Circuit).get(slug="active")
+        circuit_type = CircuitType.objects.first()
+        status = Status.objects.get_for_model(Circuit).first()
         circuit = Circuit.objects.create(
             cid="Test Circuit",
             provider=provider,
             circuit_type=circuit_type,
-            status=active_status,
+            status=status,
         )
         CircuitTermination.objects.create(
             circuit=circuit,

nautobot/circuits/views.py

@@ -2,6 +2,7 @@ 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.http import is_safe_url
 from django_tables2 import RequestConfig
 
 
@@ -28,7 +29,6 @@ class CircuitTypeUIViewSet(
     view_mixins.ObjectChangeLogViewMixin,
     view_mixins.ObjectNotesViewMixin,
 ):
-    bulk_create_form_class = forms.CircuitTypeCSVForm
     filterset_class = filters.CircuitTypeFilterSet
     form_class = forms.CircuitTypeForm
     queryset = CircuitType.objects.annotate(circuit_count=count_related(Circuit, "circuit_type"))
@@ -60,15 +60,20 @@ class CircuitTypeUIViewSet(
 
 class CircuitTerminationUIViewSet(
     view_mixins.ObjectDetailViewMixin,
+    view_mixins.ObjectListViewMixin,
     view_mixins.ObjectEditViewMixin,
     view_mixins.ObjectDestroyViewMixin,
+    view_mixins.ObjectBulkDestroyViewMixin,
+    view_mixins.ObjectBulkCreateViewMixin,
     view_mixins.ObjectChangeLogViewMixin,
     view_mixins.ObjectNotesViewMixin,
 ):
+    action_buttons = ("import", "export")
+    filterset_class = filters.CircuitTerminationFilterSet
     form_class = forms.CircuitTerminationForm
-    lookup_field = "pk"
     queryset = CircuitTermination.objects.all()
     serializer_class = serializers.CircuitTerminationSerializer
+    table_class = tables.CircuitTerminationTable
 
     def get_object(self):
         obj = super().get_object()
@@ -76,12 +81,20 @@ class CircuitTerminationUIViewSet(
             obj.circuit = get_object_or_404(Circuit, pk=self.kwargs["circuit"])
         return obj
 
-    def get_return_url(self, request, obj):
-        return obj.circuit.get_absolute_url()
+    def get_return_url(self, request, obj=None):
+        # First, see if `return_url` was specified as a query parameter or form data. Use this URL only if it's
+        # considered safe.
+        query_param = request.GET.get("return_url") or request.POST.get("return_url")
+        if query_param and is_safe_url(url=query_param, allowed_hosts=request.get_host()):
+            return query_param
+
+        if obj is not None and obj.present_in_database and obj.pk:
+            return obj.circuit.get_absolute_url()
+
+        return super().get_return_url(request, obj=obj)
 
 
 class ProviderUIViewSet(NautobotUIViewSet):
-    bulk_create_form_class = forms.ProviderCSVForm
     bulk_update_form_class = forms.ProviderBulkEditForm
     filterset_class = filters.ProviderFilterSet
     filterset_form_class = forms.ProviderFilterForm
@@ -113,12 +126,10 @@ class ProviderUIViewSet(NautobotUIViewSet):
 
 
 class CircuitUIViewSet(NautobotUIViewSet):
-    bulk_create_form_class = forms.CircuitCSVForm
     bulk_update_form_class = forms.CircuitBulkEditForm
     filterset_class = filters.CircuitFilterSet
     filterset_form_class = forms.CircuitFilterForm
     form_class = forms.CircuitForm
-    lookup_field = "pk"
     # v2 TODO(jathan): Replace prefetch_related with select_related
     prefetch_related = ["provider", "circuit_type", "tenant", "circuit_termination_a", "circuit_termination_z"]
     queryset = Circuit.objects.all()
@@ -167,7 +178,6 @@ class CircuitUIViewSet(NautobotUIViewSet):
 
 class ProviderNetworkUIViewSet(NautobotUIViewSet):
     model = ProviderNetwork
-    bulk_create_form_class = forms.ProviderNetworkCSVForm
     bulk_update_form_class = forms.ProviderNetworkBulkEditForm
     filterset_class = filters.ProviderNetworkFilterSet
     filterset_form_class = forms.ProviderNetworkFilterForm
@@ -238,7 +248,6 @@ class CircuitSwapTerminations(generic.ObjectEditView):
         form = ConfirmationForm(request.POST)
 
         if form.is_valid():
-
             circuit_termination_a = CircuitTermination.objects.filter(
                 circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
             ).first()

nautobot/core/api/__init__.py

@@ -4,10 +4,13 @@ from .fields import (
     SerializedPKRelatedField,
     TimeZoneSerializerField,
 )
-from .routers import OrderedDefaultRouter
 from .serializers import (
     BaseModelSerializer,
     BulkOperationSerializer,
+    CustomFieldModelSerializerMixin,
+    NautobotModelSerializer,
+    NotesSerializerMixin,
+    RelationshipModelSerializerMixin,
     TreeModelSerializerMixin,
     ValidatedModelSerializer,
     WritableNestedSerializer,
@@ -19,7 +22,10 @@ __all__ = (
     "BulkOperationSerializer",
     "ChoiceField",
     "ContentTypeField",
-    "OrderedDefaultRouter",
+    "CustomFieldModelSerializerMixin",
+    "NautobotModelSerializer",
+    "NotesSerializerMixin",
+    "RelationshipModelSerializerMixin",
     "SerializedPKRelatedField",
     "TimeZoneSerializerField",
     "TreeModelSerializerMixin",

nautobot/core/api/authentication.py

@@ -49,14 +49,12 @@ class TokenPermissions(DjangoObjectPermissions):
     }
 
     def _verify_write_permission(self, request):
-
         # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
         if request.method in SAFE_METHODS or request.auth.write_enabled:
             return True
         return False
 
     def has_permission(self, request, view):
-
         # Enforce Token write ability
         if isinstance(request.auth, Token) and not self._verify_write_permission(request):
             return False
@@ -64,7 +62,6 @@ class TokenPermissions(DjangoObjectPermissions):
         return super().has_permission(request, view)
 
     def has_object_permission(self, request, view, obj):
-
         # Enforce Token write ability
         if isinstance(request.auth, Token) and not self._verify_write_permission(request):
             return False