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

nautobot/apps/api.py

@@ -2,17 +2,16 @@
 
 from nautobot.core.api import (
     BaseModelSerializer,
-    OrderedDefaultRouter,
+    CustomFieldModelSerializerMixin,
+    NautobotModelSerializer,
+    NotesSerializerMixin,
+    RelationshipModelSerializerMixin,
     ValidatedModelSerializer,
     WritableNestedSerializer,
 )
+from nautobot.core.api.routers import OrderedDefaultRouter
 from nautobot.core.api.views import ModelViewSet, ReadOnlyModelViewSet
-from nautobot.extras.api.customfields import CustomFieldModelSerializerMixin
-from nautobot.extras.api.serializers import (
-    NautobotModelSerializer,
-    NotesSerializerMixin,
-    RelationshipModelSerializerMixin,
-    StatusModelSerializerMixin,
+from nautobot.extras.api.mixins import (
     TaggedModelSerializerMixin,
 )
 from nautobot.extras.api.views import CustomFieldModelViewSet, NautobotModelViewSet, NotesViewSetMixin
@@ -29,7 +28,6 @@ __all__ = (
     "OrderedDefaultRouter",
     "ReadOnlyModelViewSet",
     "RelationshipModelSerializerMixin",
-    "StatusModelSerializerMixin",
     "TaggedModelSerializerMixin",
     "ValidatedModelSerializer",
     "WritableNestedSerializer",

nautobot/apps/forms.py

@@ -19,7 +19,6 @@ from nautobot.extras.forms import (
     RelationshipModelBulkEditFormMixin,
     RelationshipModelFormMixin,
     StatusModelBulkEditFormMixin,
-    StatusModelCSVFormMixin,
     TagsBulkEditFormMixin,
 )
 from nautobot.ipam.formfields import IPAddressFormField, IPNetworkFormField
@@ -45,7 +44,6 @@ __all__ = (
     "RelationshipModelBulkEditFormMixin",
     "RelationshipModelFormMixin",
     "StatusModelBulkEditFormMixin",
-    "StatusModelCSVFormMixin",
     "TagsBulkEditFormMixin",
     "TagFilterField",
     "TimePicker",

nautobot/apps/ui.py

@@ -3,14 +3,10 @@
 from nautobot.core.apps import (
     HomePageItem,
     HomePagePanel,
-    NavMenuAddButton,
-    NavMenuButton,
     NavMenuGroup,
-    NavMenuImportButton,
     NavMenuItem,
     NavMenuTab,
 )
-from nautobot.core.choices import ButtonColorChoices
 from nautobot.extras.choices import BannerClassChoices
 from nautobot.extras.plugins import Banner
 from nautobot.extras.plugins import TemplateExtension
@@ -18,13 +14,9 @@ from nautobot.extras.plugins import TemplateExtension
 __all__ = (
     "Banner",
     "BannerClassChoices",
-    "ButtonColorChoices",
     "HomePageItem",
     "HomePagePanel",
-    "NavMenuAddButton",
-    "NavMenuButton",
     "NavMenuGroup",
-    "NavMenuImportButton",
     "NavMenuItem",
     "NavMenuTab",
     "TemplateExtension",

nautobot/circuits/api/serializers.py

@@ -1,33 +1,14 @@
 from rest_framework import serializers
 
 from nautobot.circuits.models import Provider, Circuit, CircuitTermination, CircuitType, ProviderNetwork
-from nautobot.core.api import WritableNestedSerializer
-from nautobot.dcim.api.nested_serializers import (
-    NestedCableSerializer,
-    NestedInterfaceSerializer,
-    NestedLocationSerializer,
-)
+from nautobot.core.api import NautobotModelSerializer
 from nautobot.dcim.api.serializers import (
     CableTerminationModelSerializerMixin,
     PathEndpointModelSerializerMixin,
 )
-from nautobot.extras.api.serializers import (
-    NautobotModelSerializer,
-    NotesSerializerMixin,
-    StatusModelSerializerMixin,
+from nautobot.extras.api.mixins import (
     TaggedModelSerializerMixin,
 )
-from nautobot.tenancy.api.nested_serializers import NestedTenantSerializer
-
-# Not all of these variable(s) are not actually used anywhere in this file, but required for the
-# automagically replacing a Serializer with its corresponding NestedSerializer.
-from .nested_serializers import (  # noqa: F401
-    NestedCircuitSerializer,
-    NestedCircuitTerminationSerializer,
-    NestedCircuitTypeSerializer,
-    NestedProviderNetworkSerializer,
-    NestedProviderSerializer,
-)
 
 #
 # Providers
@@ -35,22 +16,11 @@ from .nested_serializers import (  # noqa: F401
 
 
 class ProviderSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:provider-detail")
     circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Provider
-        fields = [
-            "url",
-            "name",
-            "asn",
-            "account",
-            "portal_url",
-            "noc_contact",
-            "admin_contact",
-            "comments",
-            "circuit_count",
-        ]
+        fields = "__all__"
 
 
 #
@@ -59,19 +29,9 @@ class ProviderSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
 
 
 class ProviderNetworkSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:providernetwork-detail")
-    provider = NestedProviderSerializer()
-
     class Meta:
         model = ProviderNetwork
-        fields = [
-            "url",
-            "provider",
-            "name",
-            "slug",
-            "description",
-            "comments",
-        ]
+        fields = "__all__"
 
 
 #
@@ -80,63 +40,17 @@ class ProviderNetworkSerializer(NautobotModelSerializer, TaggedModelSerializerMi
 
 
 class CircuitTypeSerializer(NautobotModelSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:circuittype-detail")
     circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = CircuitType
-        fields = [
-            "url",
-            "name",
-            "description",
-            "circuit_count",
-        ]
-
+        fields = "__all__"
 
-class CircuitCircuitTerminationSerializer(WritableNestedSerializer, NotesSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:circuittermination-detail")
-    location = NestedLocationSerializer(required=False, allow_null=True)
-    provider_network = NestedProviderNetworkSerializer()
-    connected_endpoint = NestedInterfaceSerializer()
-
-    class Meta:
-        model = CircuitTermination
-        fields = [
-            "id",
-            "url",
-            "location",
-            "provider_network",
-            "connected_endpoint",
-            "port_speed",
-            "upstream_speed",
-            "xconnect_id",
-        ]
-
-
-class CircuitSerializer(NautobotModelSerializer, StatusModelSerializerMixin, TaggedModelSerializerMixin):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:circuit-detail")
-    provider = NestedProviderSerializer()
-    circuit_type = NestedCircuitTypeSerializer()
-    tenant = NestedTenantSerializer(required=False, allow_null=True)
-    circuit_termination_a = CircuitCircuitTerminationSerializer(read_only=True)
-    circuit_termination_z = CircuitCircuitTerminationSerializer(read_only=True)
 
+class CircuitSerializer(NautobotModelSerializer, TaggedModelSerializerMixin):
     class Meta:
         model = Circuit
-        fields = [
-            "url",
-            "cid",
-            "provider",
-            "circuit_type",
-            "status",
-            "tenant",
-            "install_date",
-            "commit_rate",
-            "description",
-            "circuit_termination_a",
-            "circuit_termination_z",
-            "comments",
-        ]
+        fields = "__all__"
 
 
 class CircuitTerminationSerializer(
@@ -144,29 +58,7 @@ class CircuitTerminationSerializer(
     CableTerminationModelSerializerMixin,
     PathEndpointModelSerializerMixin,
 ):
-    url = serializers.HyperlinkedIdentityField(view_name="circuits-api:circuittermination-detail")
-    circuit = NestedCircuitSerializer()
-    location = NestedLocationSerializer(required=False, allow_null=True)
-    provider_network = NestedProviderNetworkSerializer(required=False, allow_null=True)
-    cable = NestedCableSerializer(read_only=True)
-
     class Meta:
         model = CircuitTermination
-        fields = [
-            "url",
-            "circuit",
-            "term_side",
-            "location",
-            "provider_network",
-            "port_speed",
-            "upstream_speed",
-            "xconnect_id",
-            "pp_info",
-            "description",
-            "cable",
-            "cable_peer",
-            "cable_peer_type",
-            "connected_endpoint",
-            "connected_endpoint_type",
-            "connected_endpoint_reachable",
-        ]
+        fields = "__all__"
+        extra_kwargs = {"cable": {"read_only": True}}

nautobot/circuits/api/urls.py

@@ -1,4 +1,4 @@
-from nautobot.core.api import OrderedDefaultRouter
+from nautobot.core.api.routers import OrderedDefaultRouter
 from . import views
 
 

nautobot/circuits/api/views.py

@@ -63,7 +63,6 @@ class CircuitTerminationViewSet(PathEndpointMixin, NautobotModelViewSet):
     )
     serializer_class = serializers.CircuitTerminationSerializer
     filterset_class = filters.CircuitTerminationFilterSet
-    brief_prefetch_fields = ["circuit"]
 
 
 #

nautobot/circuits/forms.py

@@ -2,7 +2,6 @@ from django import forms
 
 from nautobot.core.forms import (
     CommentField,
-    CSVModelChoiceField,
     DatePicker,
     DynamicModelChoiceField,
     DynamicModelMultipleChoiceField,
@@ -15,12 +14,10 @@ from nautobot.dcim.form_mixins import (
     LocatableModelFormMixin,
 )
 from nautobot.extras.forms import (
-    CustomFieldModelCSVForm,
     NautobotFilterForm,
     NautobotBulkEditForm,
     NautobotModelForm,
     StatusModelBulkEditFormMixin,
-    StatusModelCSVFormMixin,
     StatusModelFilterFormMixin,
     TagsBulkEditFormMixin,
 )
@@ -62,12 +59,6 @@ class ProviderForm(NautobotModelForm):
         }
 
 
-class ProviderCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = Provider
-        fields = Provider.csv_headers
-
-
 class ProviderBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=Provider.objects.all(), widget=forms.MultipleHiddenInput)
     asn = forms.IntegerField(required=False, label="ASN")
@@ -119,20 +110,6 @@ class ProviderNetworkForm(NautobotModelForm):
         fieldsets = (("Provider Network", ("provider", "name", "slug", "description", "comments", "tags")),)
 
 
-class ProviderNetworkCSVForm(CustomFieldModelCSVForm):
-    provider = CSVModelChoiceField(queryset=Provider.objects.all(), to_field_name="name", help_text="Assigned provider")
-
-    class Meta:
-        model = ProviderNetwork
-        fields = [
-            "provider",
-            "name",
-            "slug",
-            "description",
-            "comments",
-        ]
-
-
 class ProviderNetworkBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=ProviderNetwork.objects.all(), widget=forms.MultipleHiddenInput)
     provider = DynamicModelChoiceField(queryset=Provider.objects.all(), required=False)
@@ -170,15 +147,6 @@ class CircuitTypeForm(NautobotModelForm):
         ]
 
 
-class CircuitTypeCSVForm(CustomFieldModelCSVForm):
-    class Meta:
-        model = CircuitType
-        fields = CircuitType.csv_headers
-        help_texts = {
-            "name": "Name of circuit type",
-        }
-
-
 #
 # Circuits
 #
@@ -213,39 +181,6 @@ class CircuitForm(NautobotModelForm, TenancyForm):
         }
 
 
-class CircuitCSVForm(StatusModelCSVFormMixin, CustomFieldModelCSVForm):
-    provider = CSVModelChoiceField(
-        queryset=Provider.objects.all(),
-        to_field_name="name",
-        help_text="Assigned provider",
-    )
-    circuit_type = CSVModelChoiceField(
-        queryset=CircuitType.objects.all(),
-        to_field_name="name",
-        help_text="Type of circuit",
-    )
-    tenant = CSVModelChoiceField(
-        queryset=Tenant.objects.all(),
-        required=False,
-        to_field_name="name",
-        help_text="Assigned tenant",
-    )
-
-    class Meta:
-        model = Circuit
-        fields = [
-            "cid",
-            "provider",
-            "circuit_type",
-            "status",
-            "tenant",
-            "install_date",
-            "commit_rate",
-            "description",
-            "comments",
-        ]
-
-
 class CircuitBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=Circuit.objects.all(), widget=forms.MultipleHiddenInput)
     circuit_type = DynamicModelChoiceField(queryset=CircuitType.objects.all(), required=False)

nautobot/circuits/migrations/0014_related_name_changes.py

@@ -7,7 +7,7 @@ import nautobot.extras.models.statuses
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("extras", "0067_created_datetime"),
+        ("extras", "0068_created_datetime"),
         ("circuits", "0013_alter_circuittermination__path"),
     ]
 

nautobot/circuits/migrations/0016_tagsfield.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.18 on 2023-04-21 13:59
+
+from django.db import migrations
+import nautobot.core.models.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0079_tagsfield"),
+        ("circuits", "0015_remove_circuittype_provider_slug"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="circuit",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="circuittermination",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="provider",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+        migrations.AlterField(
+            model_name="providernetwork",
+            name="tags",
+            field=nautobot.core.models.fields.TagsField(through="extras.TaggedItem", to="extras.Tag"),
+        ),
+    ]

nautobot/circuits/migrations/0017_fixup_null_statuses.py

@@ -0,0 +1,22 @@
+from django.db import migrations
+
+from nautobot.extras.utils import fixup_null_statuses
+
+
+def migrate_null_statuses(apps, schema):
+    status_model = apps.get_model("extras", "Status")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    for model_name in ("Circuit",):
+        model = apps.get_model("circuits", model_name)
+        model_ct = ContentType.objects.get_for_model(model)
+        fixup_null_statuses(model=model, model_contenttype=model_ct, status_model=status_model)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("circuits", "0016_tagsfield"),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_null_statuses, migrations.RunPython.noop),
+    ]

nautobot/circuits/migrations/0018_status_nonnullable.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.18 on 2023-05-19 18:05
+
+from django.db import migrations
+import django.db.models.deletion
+import nautobot.extras.models.statuses
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0083_rename_computed_field_slug_to_key"),
+        ("circuits", "0017_fixup_null_statuses"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="circuit",
+            name="status",
+            field=nautobot.extras.models.statuses.StatusField(
+                on_delete=django.db.models.deletion.PROTECT, related_name="circuits", to="extras.status"
+            ),
+        ),
+    ]

nautobot/circuits/models.py

@@ -1,11 +1,10 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.urls import reverse
 
 from nautobot.dcim.fields import ASNField
 from nautobot.dcim.models import CableTermination, PathEndpoint
-from nautobot.extras.models import StatusModel
+from nautobot.extras.models import StatusField
 from nautobot.extras.utils import extras_features
 from nautobot.core.models.fields import AutoSlugField
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
@@ -36,14 +35,6 @@ class ProviderNetwork(PrimaryModel):
     description = models.CharField(max_length=200, blank=True)
     comments = models.TextField(blank=True)
 
-    csv_headers = [
-        "provider",
-        "name",
-        "slug",
-        "description",
-        "comments",
-    ]
-
     class Meta:
         ordering = ("provider", "name")
         constraints = (
@@ -54,18 +45,6 @@ class ProviderNetwork(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("circuits:providernetwork", args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.provider.name,
-            self.name,
-            self.slug,
-            self.description,
-            self.comments,
-        )
-
     @property
     def display(self):
         return f"{self.provider} {self.name}"
@@ -98,15 +77,6 @@ class Provider(PrimaryModel):
     admin_contact = models.TextField(blank=True, verbose_name="Admin contact")
     comments = models.TextField(blank=True)
 
-    csv_headers = [
-        "name",
-        "asn",
-        "account",
-        "portal_url",
-        "noc_contact",
-        "admin_contact",
-        "comments",
-    ]
     clone_fields = [
         "asn",
         "account",
@@ -121,20 +91,6 @@ class Provider(PrimaryModel):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("circuits:provider", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.asn,
-            self.account,
-            self.portal_url,
-            self.noc_contact,
-            self.admin_contact,
-            self.comments,
-        )
-
 
 @extras_features("custom_validators", "graphql")
 class CircuitType(OrganizationalModel):
@@ -149,23 +105,12 @@ class CircuitType(OrganizationalModel):
         blank=True,
     )
 
-    csv_headers = ["name", "description"]
-
     class Meta:
         ordering = ["name"]
 
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse("circuits:circuittype", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.description,
-        )
-
 
 @extras_features(
     "custom_links",
@@ -175,7 +120,7 @@ class CircuitType(OrganizationalModel):
     "statuses",
     "webhooks",
 )
-class Circuit(PrimaryModel, StatusModel):
+class Circuit(PrimaryModel):
     """
     A communications circuit connects two points.
     Each Circuit belongs to a Provider; Providers may have multiple circuits.
@@ -184,6 +129,7 @@ class Circuit(PrimaryModel, StatusModel):
     """
 
     cid = models.CharField(max_length=100, verbose_name="Circuit ID")
+    status = StatusField(blank=False, null=False)
     provider = models.ForeignKey(to="circuits.Provider", on_delete=models.PROTECT, related_name="circuits")
     circuit_type = models.ForeignKey(to="CircuitType", on_delete=models.PROTECT, related_name="circuits")
     tenant = models.ForeignKey(
@@ -216,17 +162,6 @@ class Circuit(PrimaryModel, StatusModel):
         null=True,
     )
 
-    csv_headers = [
-        "cid",
-        "provider",
-        "circuit_type",
-        "status",
-        "tenant",
-        "install_date",
-        "commit_rate",
-        "description",
-        "comments",
-    ]
     clone_fields = [
         "provider",
         "circuit_type",
@@ -244,22 +179,6 @@ class Circuit(PrimaryModel, StatusModel):
     def __str__(self):
         return self.cid
 
-    def get_absolute_url(self):
-        return reverse("circuits:circuit", args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.cid,
-            self.provider.name,
-            self.circuit_type.name,
-            self.get_status_display(),
-            self.tenant.name if self.tenant else None,
-            self.install_date,
-            self.commit_rate,
-            self.description,
-            self.comments,
-        )
-
 
 @extras_features(
     "cable_terminations",
@@ -305,9 +224,6 @@ class CircuitTermination(PrimaryModel, PathEndpoint, CableTermination):
     def __str__(self):
         return f"Termination {self.term_side}: {self.location or self.provider_network}"
 
-    def get_absolute_url(self):
-        return reverse("circuits:circuittermination", args=[self.pk])
-
     def clean(self):
         super().clean()