nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/apps/choices.py

@@ -38,11 +38,11 @@ from nautobot.dcim.choices import (
     SubdeviceRoleChoices,
 )
 from nautobot.extras.choices import (
+    ApprovalWorkflowStateChoices,
     BannerClassChoices,
     ButtonClassChoices,
     CustomFieldFilterLogicChoices,
     CustomFieldTypeChoices,
-    CustomLinkButtonClassChoices,
     DynamicGroupOperatorChoices,
     JobExecutionType,
     JobResultStatusChoices,
@@ -65,6 +65,7 @@ from nautobot.ipam.choices import (
 )
 
 __all__ = (
+    "ApprovalWorkflowStateChoices",
     "BannerClassChoices",
     "ButtonActionColorChoices",
     "ButtonActionIconChoices",
@@ -77,7 +78,6 @@ __all__ = (
     "ConsolePortTypeChoices",
     "CustomFieldFilterLogicChoices",
     "CustomFieldTypeChoices",
-    "CustomLinkButtonClassChoices",
     "DeviceFaceChoices",
     "DeviceRedundancyGroupFailoverStrategyChoices",
     "DynamicGroupOperatorChoices",

nautobot/apps/filters.py

@@ -8,6 +8,7 @@ from nautobot.core.filters import (
     ContentTypeMultipleChoiceFilter,
     MACAddressFilter,
     MappedPredicatesFilterMixin,
+    ModelMultipleChoiceFilter,
     multivalue_field_factory,
     MultiValueBigNumberFilter,
     MultiValueCharFilter,
@@ -27,24 +28,22 @@ from nautobot.core.filters import (
     TagFilter,
     TreeNodeMultipleChoiceFilter,
 )
-from nautobot.extras.filters import (
+from nautobot.extras.filter_mixins import (
+    ConfigContextRoleFilter,
     CreatedUpdatedModelFilterSetMixin,
     CustomFieldModelFilterSetMixin,
-    NautobotFilterSet,
-    RelationshipModelFilterSetMixin,
-    StatusModelFilterSetMixin,
-)
-from nautobot.extras.filters.mixins import (
-    ConfigContextRoleFilter,
     LocalContextModelFilterSetMixin,
     RelationshipFilter,
+    RelationshipModelFilterSetMixin,
     RoleFilter,
     RoleModelFilterSetMixin,
     StatusFilter,
+    StatusModelFilterSetMixin,
 )
+from nautobot.extras.filters import NautobotFilterSet
 from nautobot.extras.plugins import FilterExtension
-from nautobot.ipam.filters import PrefixFilter
-from nautobot.tenancy.filters import TenancyModelFilterSetMixin
+from nautobot.ipam.filter_mixins import PrefixFilter
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 
 __all__ = (
     "BaseFilterSet",
@@ -59,6 +58,7 @@ __all__ = (
     "LocalContextModelFilterSetMixin",
     "MACAddressFilter",
     "MappedPredicatesFilterMixin",
+    "ModelMultipleChoiceFilter",
     "MultiValueBigNumberFilter",
     "MultiValueCharFilter",
     "MultiValueDateFilter",

nautobot/apps/forms.py

@@ -68,6 +68,7 @@ from nautobot.core.forms.widgets import (
     StaticSelect2Multiple,
     TimePicker,
 )
+from nautobot.data_validation.form_mixin import DataValidationModelFormMixin
 from nautobot.extras.forms import (
     CustomFieldModelBulkEditFormMixin,
     CustomFieldModelCSVForm,
@@ -125,6 +126,7 @@ __all__ = (
     "CustomFieldModelCSVForm",
     "CustomFieldModelFilterFormMixin",
     "CustomFieldModelFormMixin",
+    "DataValidationModelFormMixin",
     "DatePicker",
     "DateTimePicker",
     "DynamicFilterForm",

nautobot/apps/models.py

@@ -36,16 +36,18 @@ from nautobot.core.models.utils import (
     serialize_object_v2,
 )
 from nautobot.core.models.validators import EnhancedURLValidator, ExclusionValidator, ValidRegexValidator
+from nautobot.data_validation.custom_validators import ComplianceError, DataComplianceRule
 from nautobot.extras.models import (
     ChangeLoggedModel,
     ConfigContextModel,
     CustomFieldModel,
     RelationshipModel,
     StatusField,
-    StatusModel,
 )
 from nautobot.extras.models.mixins import (
+    ApprovableModelMixin,
     ContactMixin,
+    DataComplianceModelMixin,
     DynamicGroupMixin,
     DynamicGroupsModelMixin,
     NotesMixin,
@@ -58,6 +60,7 @@ from nautobot.ipam.fields import VarbinaryIPField
 from nautobot.ipam.models import get_default_namespace, get_default_namespace_pk
 
 __all__ = (
+    "ApprovableModelMixin",
     "AttributeSetter",
     "AutoSlugField",
     "BaseManager",
@@ -65,6 +68,7 @@ __all__ = (
     "ChangeLoggedModel",
     "CollateAsChar",
     "ColorField",
+    "ComplianceError",
     "CompositeKeyQuerySetMixin",
     "ConfigContextModel",
     "ConfigContextSchemaValidationMixin",
@@ -72,6 +76,8 @@ __all__ = (
     "ContentTypeRelatedQuerySet",
     "CustomFieldModel",
     "CustomValidator",
+    "DataComplianceModelMixin",
+    "DataComplianceRule",
     "DynamicGroupMixin",
     "DynamicGroupsModelMixin",
     "EmptyGroupByJSONBAgg",
@@ -92,7 +98,6 @@ __all__ = (
     "RestrictedQuerySet",
     "SavedViewMixin",
     "StatusField",
-    "StatusModel",
     "TagsField",
     "TagsManager",
     "TreeManager",

nautobot/apps/ui.py

@@ -12,7 +12,18 @@ from nautobot.core.ui.breadcrumbs import (
     ModelBreadcrumbItem,
     ViewNameBreadcrumbItem,
 )
-from nautobot.core.ui.choices import LayoutChoices, SectionChoices
+from nautobot.core.ui.choices import (
+    EChartsTypeChoices,
+    LayoutChoices,
+    NavigationIconChoices,
+    NavigationWeightChoices,
+    SectionChoices,
+)
+from nautobot.core.ui.echarts import (
+    EChartsBase,
+    queryset_to_nested_dict_keys_as_series,
+    queryset_to_nested_dict_records_as_series,
+)
 from nautobot.core.ui.homepage import (
     HomePageBase,
     HomePageGroup,
@@ -35,6 +46,7 @@ from nautobot.core.ui.object_detail import (
     DataTablePanel,
     DistinctViewTab,
     DropdownButton,
+    EChartsPanel,
     GroupedKeyValueTablePanel,
     KeyValueTablePanel,
     ObjectDetailContent,
@@ -64,6 +76,9 @@ __all__ = (
     "DataTablePanel",
     "DistinctViewTab",
     "DropdownButton",
+    "EChartsBase",
+    "EChartsPanel",
+    "EChartsTypeChoices",
     "GroupedKeyValueTablePanel",
     "HomePageBase",
     "HomePageGroup",
@@ -81,6 +96,8 @@ __all__ = (
     "NavMenuImportButton",
     "NavMenuItem",
     "NavMenuTab",
+    "NavigationIconChoices",
+    "NavigationWeightChoices",
     "ObjectDetailContent",
     "ObjectFieldsPanel",
     "ObjectTextPanel",
@@ -95,5 +112,7 @@ __all__ = (
     "Titles",
     "ViewNameBreadcrumbItem",
     "context_object_attr",
+    "queryset_to_nested_dict_keys_as_series",
+    "queryset_to_nested_dict_records_as_series",
     "render_component_template",
 )

nautobot/apps/utils.py

@@ -1,6 +1,7 @@
 """Nautobot utility functions."""
 
 from nautobot.core.releases import get_latest_release
+from nautobot.core.utils.cache import construct_cache_key
 from nautobot.core.utils.color import foreground_color, hex_to_rgb, lighten_color, rgb_to_hex
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.core.utils.data import (
@@ -52,7 +53,6 @@ from nautobot.core.utils.requests import (
     is_single_choice_field,
     normalize_querydict,
 )
-from nautobot.extras.plugins.validators import custom_validator_clean, wrap_model_clean_methods
 from nautobot.extras.utils import (
     ChangeLoggedModelsQuery,
     check_if_key_is_graphql_safe,
@@ -85,9 +85,9 @@ __all__ = (
     "check_if_key_is_graphql_safe",
     "class_deprecated",
     "class_deprecated_in_favor_of",
+    "construct_cache_key",
     "convert_git_diff_log_to_list",
     "convert_querydict_to_factory_formset_acceptable_querydict",
-    "custom_validator_clean",
     "deepmerge",
     "ensure_content_type_and_field_name_in_query_params",
     "fixup_null_statuses",
@@ -141,5 +141,4 @@ __all__ = (
     "task_queues_as_choices",
     "to_meters",
     "validate_jinja2",
-    "wrap_model_clean_methods",
 )

nautobot/apps/views.py

@@ -43,7 +43,12 @@ from nautobot.core.views.utils import (
     prepare_cloned_fields,
 )
 from nautobot.core.views.viewsets import NautobotUIViewSet
-from nautobot.extras.views import check_and_call_git_repository_function, ObjectDynamicGroupsView, ObjectNotesView
+from nautobot.extras.views import (
+    check_and_call_git_repository_function,
+    ObjectApprovalWorkflowView,
+    ObjectDynamicGroupsView,
+    ObjectNotesView,
+)
 
 __all__ = (
     "AdminRequiredMixin",
@@ -62,6 +67,7 @@ __all__ = (
     "NautobotHTMLRenderer",
     "NautobotUIViewSet",
     "NautobotViewSetMixin",
+    "ObjectApprovalWorkflowView",
     "ObjectBulkCreateViewMixin",  # 3.0 TODO: remove this
     "ObjectBulkDestroyViewMixin",
     "ObjectBulkUpdateViewMixin",

nautobot/circuits/filters.py

@@ -1,5 +1,3 @@
-import django_filters
-
 from nautobot.cloud.models import CloudNetwork
 from nautobot.core.filters import (
     BaseFilterSet,
@@ -15,8 +13,9 @@ from nautobot.dcim.filters import (
     PathEndpointModelFilterSetMixin,
 )
 from nautobot.dcim.models import Location
-from nautobot.extras.filters import NautobotFilterSet, StatusModelFilterSetMixin
-from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
+from nautobot.extras.filter_mixins import StatusModelFilterSetMixin
+from nautobot.extras.filters import NautobotFilterSet
+from nautobot.tenancy.filter_mixins import TenancyModelFilterSetMixin
 
 from .models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 
@@ -51,7 +50,6 @@ class ProviderFilterSet(NautobotFilterSet):
     provider_networks = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
         to_field_name="name",
-        label="Provider networks (name or ID)",
     )
     has_provider_networks = RelatedMembershipBooleanFilter(
         field_name="provider_networks",
@@ -88,10 +86,6 @@ class ProviderNetworkFilterSet(NautobotFilterSet):
             "comments": "icontains",
         },
     )
-    circuit_terminations = django_filters.ModelMultipleChoiceFilter(
-        queryset=CircuitTermination.objects.all(),
-        label="Circuit Terminations (ID)",
-    )
     has_circuit_terminations = RelatedMembershipBooleanFilter(
         field_name="circuit_terminations",
         label="Has circuit terminations",
@@ -100,12 +94,11 @@ class ProviderNetworkFilterSet(NautobotFilterSet):
         field_name="provider",
         queryset=Provider.objects.all(),
         to_field_name="name",
-        label="Provider (name or ID)",
     )
 
     class Meta:
         model = ProviderNetwork
-        fields = ["comments", "description", "id", "name", "tags"]
+        fields = ["circuit_terminations", "comments", "description", "id", "name", "tags"]
 
 
 class CircuitTypeFilterSet(NautobotFilterSet, NameSearchFilterSet):
@@ -128,7 +121,6 @@ class CircuitFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMode
     provider = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=Provider.objects.all(),
         to_field_name="name",
-        label="Provider (name or ID)",
     )
     provider_network = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="circuit_terminations__provider_network",
@@ -139,7 +131,6 @@ class CircuitFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMode
     circuit_type = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=CircuitType.objects.all(),
         to_field_name="name",
-        label="Circuit type (name or ID)",
     )
     location = TreeNodeMultipleChoiceFilter(
         prefers_id=True,
@@ -152,14 +143,6 @@ class CircuitFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMode
         field_name="circuit_terminations",
         label="Has terminations",
     )
-    circuit_termination_a = django_filters.ModelMultipleChoiceFilter(
-        queryset=CircuitTermination.objects.all(),
-        label="Termination A (ID)",
-    )
-    circuit_termination_z = django_filters.ModelMultipleChoiceFilter(
-        queryset=CircuitTermination.objects.all(),
-        label="Termination Z (ID)",
-    )
 
     cloud_network = NaturalKeyOrPKMultipleChoiceFilter(
         field_name="circuit_terminations__cloud_network",
@@ -173,6 +156,8 @@ class CircuitFilterSet(NautobotFilterSet, StatusModelFilterSetMixin, TenancyMode
         fields = [
             "cid",
             "circuit_terminations",
+            "circuit_termination_a",
+            "circuit_termination_z",
             "comments",
             "commit_rate",
             "description",
@@ -204,10 +189,10 @@ class CircuitTerminationFilterSet(
     provider_network = NaturalKeyOrPKMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
         to_field_name="name",
-        label="Provider Network (name or ID)",
     )
     cloud_network = NaturalKeyOrPKMultipleChoiceFilter(
-        queryset=CloudNetwork.objects.all(), to_field_name="name", label="Cloud Network (name or ID)"
+        queryset=CloudNetwork.objects.all(),
+        to_field_name="name",
     )
 
     class Meta:

nautobot/circuits/navigation.py

@@ -4,11 +4,13 @@ from nautobot.core.apps import (
     NavMenuItem,
     NavMenuTab,
 )
+from nautobot.core.ui.choices import NavigationIconChoices, NavigationWeightChoices
 
 menu_items = (
     NavMenuTab(
         name="Circuits",
-        weight=500,
+        icon=NavigationIconChoices.CIRCUITS,
+        weight=NavigationWeightChoices.CIRCUITS,
         groups=(
             NavMenuGroup(
                 name="Circuits",

nautobot/circuits/templates/circuits/circuit_create.html

@@ -2,22 +2,22 @@
 {% load form_helpers %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Circuit</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Circuit</strong></div>
+        <div class="card-body">
             {% render_field form.provider %}
             {% render_field form.cid %}
             {% render_field form.circuit_type %}
             {% render_field form.status %}
             {% render_field form.install_date %}
-            <div class="form-group">
-                <label class="col-md-3 control-label" for="id_commit_rate">{{ form.commit_rate.label }}</label>
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_commit_rate">{{ form.commit_rate.label }}</label>
                 <div class="col-md-9">
                     <div class="input-group">
                         {{ form.commit_rate }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='commit_rate' %}
                     </div>
-                    <span class="help-block">{{ form.commit_rate.help_text }}</span>
+                    <span class="form-text">{{ form.commit_rate.help_text }}</span>
                 </div>
             </div>
             {% render_field form.description %}
@@ -25,9 +25,9 @@
     </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>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Comments</strong></div>
+        <div class="card-body">
             {% render_field form.comments %}
         </div>
     </div>

nautobot/circuits/templates/circuits/circuit_terminations_swap.html

@@ -10,7 +10,7 @@
             {% if circuit_termination_a %}
                 {{ circuit_termination_a.location }} {% if circuit_termination_a.interface %}- {{ circuit_termination_a.interface.device }} {{ circuit_termination_a.interface }}{% endif %}
             {% else %}
-                <span class="text-muted">None</span>
+                <span class="text-secondary">None</span>
             {% endif %}
         </li>
         <li>
@@ -18,7 +18,7 @@
             {% if circuit_termination_z %}
                 {{ circuit_termination_z.location }} {% if circuit_termination_z.interface %}- {{ circuit_termination_z.interface.device }} {{ circuit_termination_z.interface }}{% endif %}
             {% else %}
-                <span class="text-muted">None</span>
+                <span class="text-secondary">None</span>
             {% endif %}
         </li>
     </ul>

nautobot/circuits/templates/circuits/circuittermination_create.html

@@ -4,34 +4,25 @@
 {% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Termination</strong></div>
-        <div class="panel-body">
-            <div class="form-group">
-                <label class="col-md-3 control-label">Provider</label>
-                <div class="col-md-9">
-                    <p class="form-control-static">{{ obj.circuit.provider }}</p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-3 control-label">Circuit</label>
-                <div class="col-md-9">
-                    <p class="form-control-static">{{ obj.circuit.cid }}</p>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-3 control-label">Termination</label>
-                <div class="col-md-9">
-                    <p class="form-control-static">{{ form.term_side.value }}</p>
-                </div>
-            </div>
+    <div class="card">
+        <div class="card-header"><strong>Termination</strong></div>
+        <div class="card-body">
+            {% include "inc/form_static_field.html" with label="Provider" value=obj.circuit.provider %}
+            {% include "inc/form_static_field.html" with label="Circuit" value=obj.circuit.cid %}
+            {% include "inc/form_static_field.html" with label="Termination" value=form.term_side.value %}
             {% with location_tab_active=form.initial.location %}
                 {% with providernetwork_tab_active=form.initial.provider_network %}
                     {% with cloudnetwork_tab_active=form.initial.cloud_network %}
                         <ul class="nav nav-tabs" role="tablist">
-                            <li role="presentation"{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} class="active"{% endif %}><a href="#location" role="tab" data-toggle="tab">Location</a></li>
-                            <li role="presentation"{% if providernetwork_tab_active %} class="active"{% endif %}><a href="#providernetwork" role="tab" data-toggle="tab">Provider Network</a></li>
-                            <li role="presentation"{% if cloudnetwork_tab_active %} class="active"{% endif %}><a href="#cloudnetwork" role="tab" data-toggle="tab">Cloud Network</a></li>
+                            <li class="nav-item" role="presentation">
+                                <a class="nav-link{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} active{% endif %}" href="#location" role="tab" data-bs-toggle="tab">Location</a>
+                            </li>
+                            <li class="nav-item" role="presentation">
+                                <a class="nav-link{% if providernetwork_tab_active %} active{% endif %}" href="#providernetwork" role="tab" data-bs-toggle="tab">Provider Network</a>
+                            </li>
+                            <li class="nav-item" role="presentation">
+                                <a class="nav-link{% if cloudnetwork_tab_active %} active{% endif %}" href="#cloudnetwork" role="tab" data-bs-toggle="tab">Cloud Network</a>
+                            </li>
                         </ul>
                         <div class="tab-content">
                             <div class="tab-pane{% if location_tab_active or not providernetwork_tab_active and not cloudnetwork_tab_active %} active{% endif %}" id="location">
@@ -49,27 +40,27 @@
             {% endwith %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Termination Details</strong></div>
-        <div class="panel-body">
-            <div class="form-group">
-                <label class="col-md-3 control-label" for="id_port_speed">{{ form.port_speed.label }}</label>
+    <div class="card">
+        <div class="card-header"><strong>Termination Details</strong></div>
+        <div class="card-body">
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_port_speed">{{ form.port_speed.label }}</label>
                 <div class="col-md-9">
                     <div class="input-group">
                         {{ form.port_speed }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
                     </div>
-                    <span class="help-block">{{ form.port_speed.help_text }}</span>
+                    <span class="form-text">{{ form.port_speed.help_text }}</span>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-md-3 control-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
+            <div class="mb-10 d-md-flex justify-content-center">
+                <label class="col-md-3 col-form-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
                 <div class="col-md-9">
                     <div class="input-group">
                         {{ form.upstream_speed }}
                         {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}
                     </div>
-                    <span class="help-block">{{ form.upstream_speed.help_text }}</span>
+                    <span class="form-text">{{ form.upstream_speed.help_text }}</span>
                 </div>
             </div>
             {% render_field form.xconnect_id %}

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

@@ -4,13 +4,13 @@ In a future release, we should delete this file.
 -->
 {% load helpers %}
 
-<div class="panel panel-default">
-    <div class="panel-heading">
+<div class="card">
+    <div class="card-header">
         {% include 'circuits/inc/circuit_termination_header_extra_content.html' with termination=termination side=side %}
         <strong>Termination - {{ side }} Side</strong>
     </div>
     {% if termination %}
-        <table class="table table-hover panel-body attr-table">
+        <table class="table table-hover card-body attr-table">
             {% if termination.location %}
                 <tr>
                     <td>Location</td>
@@ -39,12 +39,12 @@ In a future release, we should delete this file.
                 <td>Speed</td>
                 <td>
                     {% if termination.port_speed and termination.upstream_speed %}
-                        <i class="mdi mdi-arrow-down-bold" title="Downstream"></i> {{ termination.port_speed|humanize_speed }} &nbsp;
-                        <i class="mdi mdi-arrow-up-bold" title="Upstream"></i> {{ termination.upstream_speed|humanize_speed }}
+                        <span class="mdi mdi-arrow-down-bold" title="Downstream"></span> {{ termination.port_speed|humanize_speed }} &nbsp;
+                        <span class="mdi mdi-arrow-up-bold" title="Upstream"></span> {{ termination.upstream_speed|humanize_speed }}
                     {% elif termination.port_speed %}
                         {{ termination.port_speed|humanize_speed }}
                     {% else %}
-                        <span class="text-muted">&mdash;</span>
+                        <span class="text-secondary">&mdash;</span>
                     {% endif %}
                 </td>
             </tr>
@@ -56,10 +56,10 @@ In a future release, we should delete this file.
                             {% if not forloop.first %}<br />{% endif %}
                             {{ ip|hyperlinked_object }} ({{ ip.vrf|default:"Global" }})
                         {% empty %}
-                            <span class="text-muted">None</span>
+                            <span class="text-secondary">None</span>
                         {% endfor %}
                     {% else %}
-                        <span class="text-muted">&mdash;</span>
+                        <span class="text-secondary">&mdash;</span>
                     {% endif %}
                 </td>
             </tr>
@@ -78,8 +78,8 @@ In a future release, we should delete this file.
             {% include 'inc/relationships_table_rows.html' with relationships_data=termination.get_relationships_data %}
         </table>
     {% else %}
-        <div class="panel-body">
-            <span class="text-muted">None</span>
+        <div class="card-body">
+            <span class="text-secondary">None</span>
         </div>
     {% endif %}
 </div>

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

@@ -1,15 +1,15 @@
 {% 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
+        <div class="float-end">
+            <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-sm">
+                <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> 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 href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm" title="Trace">
+        <span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>
     </a>
     {% with peer=termination.get_cable_peer %}
         to
@@ -22,19 +22,19 @@
     {% endwith %}
 {% else %}
     {% if perms.dcim.add_cable %}
-        <div class="pull-right">
+        <div class="float-end">
             <span class="dropdown">
-                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" data-bs-popper-config='{"strategy": "fixed"}' 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 class="dropdown-menu dropdown-menu-end">
+                    <li><a class="dropdown-item" 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 class="dropdown-item" 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 class="dropdown-item" 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 class="dropdown-item" 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>
+    <span class="text-secondary">Not defined</span>
 {% endif %}