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

nautobot/apps/__init__.py

@@ -6,6 +6,6 @@ from nautobot.extras.plugins import NautobotAppConfig
 
 __all__ = (
     "ConstanceConfigItem",
-    "nautobot_database_ready",
     "NautobotAppConfig",
+    "nautobot_database_ready",
 )

nautobot/apps/api.py

@@ -56,12 +56,6 @@ __all__ = (
     "ContentTypeField",
     "CustomFieldModelSerializerMixin",
     "CustomFieldModelViewSet",
-    "dict_to_filter_params",
-    "dynamic_import",
-    "get_api_version_serializer",
-    "get_serializer_for_model",
-    "get_view_name",
-    "is_api_request",
     "LaxURLField",
     "ModelViewSet",
     "ModelViewSetMixin",
@@ -78,13 +72,19 @@ __all__ = (
     "OrderedDefaultRouter",
     "ReadOnlyModelViewSet",
     "RelationshipModelSerializerMixin",
-    "rest_api_server_error",
     "SerializedPKRelatedField",
     "TaggedModelSerializerMixin",
     "TimeZoneSerializerField",
     "TreeModelSerializerMixin",
     "ValidatedModelSerializer",
-    "versioned_serializer_selector",
     "WritableNestedSerializer",
     "WritableSerializerMixin",
+    "dict_to_filter_params",
+    "dynamic_import",
+    "get_api_version_serializer",
+    "get_serializer_for_model",
+    "get_view_name",
+    "is_api_request",
+    "rest_api_server_error",
+    "versioned_serializer_selector",
 )

nautobot/apps/change_logging.py

@@ -11,11 +11,11 @@ from nautobot.extras.context_managers import (
 )
 
 __all__ = (
-    "change_logging",
     "ChangeContext",
     "JobChangeContext",
     "JobHookChangeContext",
     "ORMChangeContext",
-    "web_request_context",
     "WebChangeContext",
+    "change_logging",
+    "web_request_context",
 )

nautobot/apps/choices.py

@@ -77,12 +77,12 @@ __all__ = (
     "DeviceFaceChoices",
     "DeviceRedundancyGroupFailoverStrategyChoices",
     "DynamicGroupOperatorChoices",
-    "InterfaceModeChoices",
-    "InterfaceRedundancyGroupProtocolChoices",
-    "InterfaceTypeChoices",
     "IPAddressRoleChoices",
     "IPAddressTypeChoices",
     "IPAddressVersionChoices",
+    "InterfaceModeChoices",
+    "InterfaceRedundancyGroupProtocolChoices",
+    "InterfaceTypeChoices",
     "JobExecutionType",
     "JobResultStatusChoices",
     "LogLevelChoices",
@@ -110,6 +110,6 @@ __all__ = (
     "SoftwareImageFileStatusChoices",
     "SoftwareVersionStatusChoices",
     "SubdeviceRoleChoices",
-    "unpack_grouped_choices",
     "WebhookHttpMethodChoices",
+    "unpack_grouped_choices",
 )

nautobot/apps/events.py

@@ -10,10 +10,10 @@ from nautobot.core.events import (
 )
 
 __all__ = (
-    "deregister_event_broker",
     "EventBroker",
-    "publish_event",
     "RedisEventBroker",
-    "register_event_broker",
     "SyslogEventBroker",
+    "deregister_event_broker",
+    "publish_event",
+    "register_event_broker",
 )

nautobot/apps/factory.py

@@ -13,11 +13,11 @@ from nautobot.core.factory import (
 
 __all__ = (
     "BaseModelFactory",
-    "get_random_instances",
     "NautobotBoolIterator",
     "NautobotFakerProvider",
     "OrganizationalModelFactory",
     "PrimaryModelFactory",
-    "random_instance",
     "UniqueFaker",
+    "get_random_instances",
+    "random_instance",
 )

nautobot/apps/filters.py

@@ -58,7 +58,6 @@ __all__ = (
     "LocalContextModelFilterSetMixin",
     "MACAddressFilter",
     "MappedPredicatesFilterMixin",
-    "multivalue_field_factory",
     "MultiValueBigNumberFilter",
     "MultiValueCharFilter",
     "MultiValueDateFilter",
@@ -84,4 +83,5 @@ __all__ = (
     "TagFilter",
     "TenancyModelFilterSetMixin",
     "TreeNodeMultipleChoiceFilter",
+    "multivalue_field_factory",
 )

nautobot/apps/forms.py

@@ -99,20 +99,13 @@ from nautobot.extras.forms.mixins import (
 from nautobot.ipam.formfields import IPAddressFormField, IPNetworkFormField
 
 __all__ = (
-    "add_blank_choice",
-    "add_field_to_filter_form_class",
-    "AddressFieldMixin",
     "APISelect",
     "APISelectMultiple",
+    "AddressFieldMixin",
     "BootstrapMixin",
     "BulkEditForm",
     "BulkEditNullBooleanSelect",
     "BulkRenameForm",
-    "ColorSelect",
-    "CommentField",
-    "ConfirmationForm",
-    "ContactTeamModelFilterFormMixin",
-    "ContentTypeSelect",
     "CSVChoiceField",
     "CSVContentTypeField",
     "CSVDataField",
@@ -121,35 +114,35 @@ __all__ = (
     "CSVModelForm",
     "CSVMultipleChoiceField",
     "CSVMultipleContentTypeField",
+    "ColorSelect",
+    "CommentField",
+    "ConfirmationForm",
+    "ContactTeamModelFilterFormMixin",
+    "ContentTypeSelect",
     "CustomFieldModelBulkEditFormMixin",
     "CustomFieldModelCSVForm",
     "CustomFieldModelFilterFormMixin",
     "CustomFieldModelFormMixin",
     "DatePicker",
     "DateTimePicker",
-    "dynamic_formset_factory",
     "DynamicFilterForm",
     "DynamicGroupModelFormMixin",
     "DynamicModelChoiceField",
     "DynamicModelChoiceMixin",
     "DynamicModelMultipleChoiceField",
-    "expand_alphanumeric_pattern",
-    "expand_ipaddress_pattern",
     "ExpandableIPAddressField",
     "ExpandableNameField",
-    "form_from_model",
-    "get_git_datasource_content_choices",
-    "ImportForm",
     "IPAddressFormField",
     "IPNetworkFormField",
+    "ImportForm",
     "JSONArrayFormField",
     "JSONField",
     "LaxURLField",
     "MACAddressField",
     "MultiMatchModelMultipleChoiceField",
-    "MultipleContentTypeField",
     "MultiValueCharField",
     "MultiValueCharInput",
+    "MultipleContentTypeField",
     "NautobotBulkEditForm",
     "NautobotFilterForm",
     "NautobotModelForm",
@@ -158,15 +151,10 @@ __all__ = (
     "NoteModelFormMixin",
     "NullableDateField",
     "NumericArrayField",
-    "parse_alphanumeric_range",
-    "parse_numeric_range",
     "PrefixFieldMixin",
-    "provider_choices",
-    "provider_choices_with_blank",
     "RelationshipModelBulkEditFormMixin",
     "RelationshipModelFilterFormMixin",
     "RelationshipModelFormMixin",
-    "restrict_form_fields",
     "ReturnURLForm",
     "RoleModelBulkEditFormMixin",
     "RoleModelFilterFormMixin",
@@ -183,4 +171,16 @@ __all__ = (
     "TagFilterField",
     "TagsBulkEditFormMixin",
     "TimePicker",
+    "add_blank_choice",
+    "add_field_to_filter_form_class",
+    "dynamic_formset_factory",
+    "expand_alphanumeric_pattern",
+    "expand_ipaddress_pattern",
+    "form_from_model",
+    "get_git_datasource_content_choices",
+    "parse_alphanumeric_range",
+    "parse_numeric_range",
+    "provider_choices",
+    "provider_choices_with_blank",
+    "restrict_form_fields",
 )

nautobot/apps/graphql.py

@@ -6,11 +6,11 @@ from nautobot.core.graphql.utils import construct_resolver, get_filtering_args_f
 
 __all__ = (
     "BigInteger",
-    "construct_resolver",
     "ContentTypeType",
+    "OptimizedNautobotObjectType",
+    "construct_resolver",
     "execute_query",
     "execute_saved_query",
     "get_filtering_args_from_filterset",
-    "OptimizedNautobotObjectType",
     "str_to_var_name",
 )

nautobot/apps/jobs.py

@@ -38,29 +38,29 @@ __all__ = (
     "ChoiceVar",
     "DatabaseFileField",
     "DryRunVar",
-    "enqueue_job_hooks",
     "FileVar",
-    "get_job",
-    "get_jobs",
     "GitRepositoryDryRun",
     "GitRepositorySync",
-    "IntegerVar",
     "IPAddressVar",
     "IPAddressWithMaskVar",
     "IPNetworkVar",
-    "is_job",
-    "is_variable",
+    "IntegerVar",
+    "JSONVar",
     "Job",
     "JobButtonReceiver",
     "JobHookReceiver",
-    "JSONVar",
     "MultiChoiceVar",
     "MultiObjectVar",
     "NautobotKombuJSONEncoder",
     "ObjectVar",
-    "register_jobs",
     "RunJobTaskFailed",
     "ScriptVariable",
     "StringVar",
     "TextVar",
+    "enqueue_job_hooks",
+    "get_job",
+    "get_jobs",
+    "is_job",
+    "is_variable",
+    "register_jobs",
 )

nautobot/apps/models.py

@@ -58,7 +58,6 @@ from nautobot.ipam.fields import VarbinaryIPField
 from nautobot.ipam.models import get_default_namespace, get_default_namespace_pk
 
 __all__ = (
-    "array_to_string",
     "AttributeSetter",
     "AutoSlugField",
     "BaseManager",
@@ -69,47 +68,29 @@ __all__ = (
     "CompositeKeyQuerySetMixin",
     "ConfigContextModel",
     "ConfigContextSchemaValidationMixin",
-    "construct_composite_key",
-    "construct_natural_slug",
     "ContactMixin",
     "ContentTypeRelatedQuerySet",
-    "count_related",
     "CustomFieldModel",
     "CustomValidator",
-    "deconstruct_composite_key",
     "DynamicGroupMixin",
     "DynamicGroupsModelMixin",
     "EmptyGroupByJSONBAgg",
     "EnhancedURLValidator",
     "ExclusionValidator",
-    "extras_features",
-    "find_models_with_matching_fields",
     "ForeignKeyLimitedByContentTypes",
     "ForeignKeyWithAutoRelatedName",
-    "get_all_concrete_models",
-    "get_default_namespace",
-    "get_default_namespace_pk",
-    "is_taggable",
     "JSONArrayField",
     "JSONBAgg",
     "LaxURLField",
-    "mac_unix_expanded_uppercase",
     "MACAddressCharField",
     "NameColorContentTypesModel",
-    "naturalize_interface",
-    "naturalize",
     "NaturalOrderingField",
     "NotesMixin",
     "OrganizationalModel",
-    "pretty_print_query",
     "PrimaryModel",
     "RelationshipModel",
     "RestrictedQuerySet",
     "SavedViewMixin",
-    "serialize_object_v2",
-    "serialize_object",
-    "slugify_dashes_to_underscores",
-    "slugify_dots_to_dashes",
     "StatusField",
     "StatusModel",
     "TagsField",
@@ -119,4 +100,23 @@ __all__ = (
     "TreeQuerySet",
     "ValidRegexValidator",
     "VarbinaryIPField",
+    "array_to_string",
+    "construct_composite_key",
+    "construct_natural_slug",
+    "count_related",
+    "deconstruct_composite_key",
+    "extras_features",
+    "find_models_with_matching_fields",
+    "get_all_concrete_models",
+    "get_default_namespace",
+    "get_default_namespace_pk",
+    "is_taggable",
+    "mac_unix_expanded_uppercase",
+    "naturalize",
+    "naturalize_interface",
+    "pretty_print_query",
+    "serialize_object",
+    "serialize_object_v2",
+    "slugify_dashes_to_underscores",
+    "slugify_dots_to_dashes",
 )

nautobot/apps/tables.py

@@ -32,7 +32,7 @@ __all__ = (
     "RelationshipColumn",
     "RoleTableMixin",
     "StatusTableMixin",
-    "TagColumn",
     "TableExtension",
+    "TagColumn",
     "ToggleColumn",
 )

nautobot/apps/testing.py

@@ -29,16 +29,8 @@ __all__ = (
     "APITestCase",
     "APITransactionTestCase",
     "APIViewTestCases",
-    "create_job_result_and_run_job",
-    "create_test_user",
-    "disable_warnings",
-    "extract_form_failures",
-    "extract_page_body",
     "FilterTestCases",
     "FormTestCases",
-    "generate_random_device_asset_tag_of_specified_size",
-    "get_deletable_objects",
-    "get_job_class_and_model",
     "ModelTestCase",
     "ModelTestCases",
     "ModelViewTestCase",
@@ -46,10 +38,18 @@ __all__ = (
     "NautobotTestCaseMixin",
     "NautobotTestClient",
     "OpenAPISchemaTestCases",
-    "post_data",
-    "run_job_for_testing",
     "SeleniumTestCase",
     "TestCase",
     "TransactionTestCase",
     "ViewTestCases",
+    "create_job_result_and_run_job",
+    "create_test_user",
+    "disable_warnings",
+    "extract_form_failures",
+    "extract_page_body",
+    "generate_random_device_asset_tag_of_specified_size",
+    "get_deletable_objects",
+    "get_job_class_and_model",
+    "post_data",
+    "run_job_for_testing",
 )

nautobot/apps/ui.py

@@ -66,14 +66,14 @@ __all__ = (
     "NavMenuTab",
     "ObjectDetailContent",
     "ObjectFieldsPanel",
-    "ObjectsTablePanel",
     "ObjectTextPanel",
+    "ObjectsTablePanel",
     "Panel",
     "PermissionsMixin",
-    "render_component_template",
     "SectionChoices",
     "StatsPanel",
     "Tab",
     "TemplateExtension",
     "TextPanel",
+    "render_component_template",
 )

nautobot/apps/utils.py

@@ -74,8 +74,13 @@ from nautobot.extras.utils import (
 
 __all__ = (
     "BranchDoesNotExist",
-    "build_lookup_label",
     "ChangeLoggedModelsQuery",
+    "FeatureQuery",
+    "FeaturedQueryMixin",
+    "GitRepo",
+    "RoleModelsQuery",
+    "TaggableClassesQuery",
+    "build_lookup_label",
     "check_if_key_is_graphql_safe",
     "class_deprecated",
     "class_deprecated_in_favor_of",
@@ -84,8 +89,6 @@ __all__ = (
     "custom_validator_clean",
     "deepmerge",
     "ensure_content_type_and_field_name_in_query_params",
-    "FeaturedQueryMixin",
-    "FeatureQuery",
     "fixup_null_statuses",
     "flatten_dict",
     "flatten_iterable",
@@ -109,11 +112,10 @@ __all__ = (
     "get_route_for_model",
     "get_settings_or_config",
     "get_table_for_model",
-    "get_view_for_model",
     "get_url_for_url_pattern",
     "get_url_patterns",
+    "get_view_for_model",
     "get_worker_count",
-    "GitRepo",
     "hex_to_rgb",
     "image_upload",
     "is_single_choice_field",
@@ -132,11 +134,9 @@ __all__ = (
     "resolve_permission",
     "resolve_permission_ct",
     "rgb_to_hex",
-    "RoleModelsQuery",
     "sanitize",
     "shallow_compare_dict",
     "swap_status_initials",
-    "TaggableClassesQuery",
     "task_queues_as_choices",
     "to_meters",
     "wrap_model_clean_methods",

nautobot/apps/views.py

@@ -52,19 +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_obj_from_context",
-    "get_paginate_count",
     "GetReturnURLMixin",
-    "handle_protectederror",
     "NautobotHTMLRenderer",
     "NautobotUIViewSet",
     "NautobotViewSetMixin",
@@ -85,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/tables.py

@@ -110,6 +110,7 @@ class CircuitTable(StatusTableMixin, BaseTable):
     pk = ToggleColumn()
     cid = tables.LinkColumn(verbose_name="ID")
     provider = tables.Column(linkify=True)
+    circuit_type = tables.Column(linkify=True)
     tenant = TenantColumn()
     tags = TagColumn(url_name="circuits:circuit_list")
 
@@ -146,7 +147,7 @@ class CircuitTable(StatusTableMixin, BaseTable):
             "pk",
             "cid",
             "provider",
-            "type",
+            "circuit_type",
             "status",
             "tenant",
             "circuit_termination_a",

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/tests/integration/test_circuits_bulk_operations.py

@@ -0,0 +1,43 @@
+import uuid
+
+from nautobot.circuits.models import Circuit, CircuitType, Provider
+from nautobot.core.testing.integration import (
+    BulkOperationsTestCases,
+)
+from nautobot.extras.models import Status
+
+
+class CircuitBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
+    """
+    Test circuits bulk edit / delete operations.
+    """
+
+    model_menu_path = ("Circuits", "Circuits")
+    model_base_viewname = "circuits:circuit"
+    model_edit_data = {"commit_rate": "12345"}
+    model_filter_by = {"circuit_type": "Copper"}
+    model_class = Circuit
+
+    def setup_items(self):
+        Circuit.objects.all().delete()
+
+        # Create locations for test
+        self.create_circuit()
+        self.create_circuit()
+        self.create_circuit()
+        self.create_circuit("Copper")
+        self.create_circuit("Copper")
+
+    @staticmethod
+    def create_circuit(circuit_type="Fiber"):
+        circuit_id = f"TestCircuit-{str(uuid.uuid4())[:6]}"
+        provider, _ = Provider.objects.get_or_create(name="A Test Provider")
+        circuit_type, _ = CircuitType.objects.get_or_create(name=circuit_type)
+
+        circuit_status = Status.objects.get_for_model(Circuit).first()
+        Circuit.objects.get_or_create(
+            cid=circuit_id,
+            provider=provider,
+            status=circuit_status,
+            circuit_type=circuit_type,
+        )

nautobot/circuits/tests/integration/test_relationships.py

@@ -19,7 +19,7 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
         self.user.is_superuser = True
         self.user.save()
         self.login(self.user.username, self.password)
-        location_type = LocationType.objects.get(name="Campus")
+        location_type, _ = LocationType.objects.get_or_create(name="Campus")
         location_ct = ContentType.objects.get_for_model(Location)
         circuit_termination_ct = ContentType.objects.get_for_model(CircuitTermination)
         provider_ct = ContentType.objects.get_for_model(Provider)

nautobot/circuits/views.py

@@ -88,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):
+    def get_return_url(self, request, obj=None, default_return_url=None):
         if obj is not None and obj.present_in_database and obj.pk:
-            return super().get_return_url(request, obj=obj.circuit)
+            return super().get_return_url(request, obj=obj.circuit, default_return_url=default_return_url)
 
-        return super().get_return_url(request, obj=obj)
+        return super().get_return_url(request, obj=obj, default_return_url=default_return_url)
 
 
 class ProviderUIViewSet(NautobotUIViewSet):