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

nautobot/__init__.py

@@ -11,6 +11,21 @@ __version__ = metadata.version(__name__)
 # Sentinel to make sure we only initialize once.
 __initialized = False
 
+
+def add_success_logger():
+    """Add a custom log level for success messages."""
+    SUCCESS = 25
+    logging.addLevelName(SUCCESS, "SUCCESS")
+
+    def success(self, message, *args, **kws):
+        if self.isEnabledFor(SUCCESS):
+            self._log(SUCCESS, message, args, **kws)
+
+    logging.Logger.success = success
+    return success
+
+
+add_success_logger()
 logger = logging.getLogger(__name__)
 
 

nautobot/apps/api.py

@@ -39,7 +39,6 @@ from nautobot.core.api.utils import (
 from nautobot.core.api.views import (
     BulkDestroyModelMixin,
     BulkUpdateModelMixin,
-    GetObjectCountsView,
     ModelViewSet,
     ModelViewSetMixin,
     ReadOnlyModelViewSet,
@@ -62,7 +61,6 @@ __all__ = (
     "get_api_version_serializer",
     "get_serializer_for_model",
     "get_view_name",
-    "GetObjectCountsView",
     "is_api_request",
     "LaxURLField",
     "ModelViewSet",

nautobot/apps/config.py

@@ -1,12 +1,41 @@
 """Helper code for loading values that may be defined in settings.py/nautobot_config.py *or* in django-constance."""
 
+import contextlib
+import logging
+
 from constance import config
 from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.db import OperationalError, ProgrammingError
+
+logger = logging.getLogger(__name__)
+
 
+def get_app_settings_or_config(app_name, variable_name, fallback=None):
+    """
+    Get a value from Django settings.PLUGINS_CONFIG (if specified there) or Constance configuration (otherwise).
 
-def get_app_settings_or_config(app_name, variable_name):
-    """Get a value from Django settings (if specified there) or Constance configuration (otherwise)."""
+    The fallback value is returned *only* if the requested variable cannot be found at all - this is an error case,
+    and will generate warning logs.
+    """
     # Explicitly set in settings.py or nautobot_config.py takes precedence, for now
     if variable_name in settings.PLUGINS_CONFIG[app_name]:
         return settings.PLUGINS_CONFIG[app_name][variable_name]
-    return getattr(config, f"{app_name}__{variable_name}")
+    # django-constance 4.x removed some built-in error handling here, so we have to do it ourselves now
+    constance_key = f"{app_name}__{variable_name}"
+    with contextlib.suppress(ObjectDoesNotExist, OperationalError, ProgrammingError):
+        return getattr(config, constance_key)
+    logger.warning(
+        '"PLUGINS_CONFIG[%r][%r]" is not in settings, and could not read from the Constance database table '
+        "(perhaps not initialized yet?)",
+        app_name,
+        variable_name,
+    )
+    if constance_key in settings.CONSTANCE_CONFIG:
+        default = settings.CONSTANCE_CONFIG[constance_key][0]
+        logger.warning('Using default value of "%s" from Constance configuration for "%s"', default, constance_key)
+        return default
+    logger.warning(
+        'Constance configuration does not include an entry for "%s" - must return %s', constance_key, fallback
+    )
+    return fallback

nautobot/apps/events.py

@@ -0,0 +1,19 @@
+"""APIs for Nautobot event-notification subsystem."""
+
+from nautobot.core.events import (
+    deregister_event_broker,
+    EventBroker,
+    publish_event,
+    RedisEventBroker,
+    register_event_broker,
+    SyslogEventBroker,
+)
+
+__all__ = (
+    "deregister_event_broker",
+    "EventBroker",
+    "publish_event",
+    "RedisEventBroker",
+    "register_event_broker",
+    "SyslogEventBroker",
+)

nautobot/apps/exceptions.py

@@ -5,7 +5,6 @@ from nautobot.core.exceptions import (
     AbortTransaction,
     CeleryWorkerNotRunningException,
     FilterSetFieldNotFound,
-    ViewConfigException,
 )
 from nautobot.extras.secrets.exceptions import (
     SecretError,
@@ -30,5 +29,4 @@ __all__ = (
     "SecretValueNotFoundError",
     "SerializerNotFound",
     "ServiceUnavailable",
-    "ViewConfigException",
 )

nautobot/apps/ui.py

@@ -1,13 +1,15 @@
 """Utilities for apps to integrate with and extend the existing Nautobot UI."""
 
-from nautobot.core.apps import (
+from nautobot.core.choices import ButtonColorChoices
+from nautobot.core.ui.base import PermissionsMixin
+from nautobot.core.ui.choices import LayoutChoices, SectionChoices
+from nautobot.core.ui.homepage import (
     HomePageBase,
     HomePageGroup,
     HomePageItem,
     HomePagePanel,
-    NavContext,
-    NavGrouping,
-    NavItem,
+)
+from nautobot.core.ui.nav import (
     NavMenuAddButton,
     NavMenuBase,
     NavMenuButton,
@@ -15,23 +17,46 @@ from nautobot.core.apps import (
     NavMenuImportButton,
     NavMenuItem,
     NavMenuTab,
-    PermissionsMixin,
 )
-from nautobot.core.choices import ButtonColorChoices
+from nautobot.core.ui.object_detail import (
+    BaseTextPanel,
+    Button,
+    Component,
+    DataTablePanel,
+    DistinctViewTab,
+    DropdownButton,
+    GroupedKeyValueTablePanel,
+    KeyValueTablePanel,
+    ObjectDetailContent,
+    ObjectFieldsPanel,
+    ObjectsTablePanel,
+    ObjectTextPanel,
+    Panel,
+    StatsPanel,
+    Tab,
+    TextPanel,
+)
+from nautobot.core.ui.utils import render_component_template
 from nautobot.extras.choices import BannerClassChoices
 from nautobot.extras.plugins import Banner, TemplateExtension
 
 __all__ = (
     "Banner",
     "BannerClassChoices",
+    "BaseTextPanel",
+    "Button",
     "ButtonColorChoices",
+    "Component",
+    "DataTablePanel",
+    "DistinctViewTab",
+    "DropdownButton",
+    "GroupedKeyValueTablePanel",
     "HomePageBase",
     "HomePageGroup",
     "HomePageItem",
     "HomePagePanel",
-    "NavContext",
-    "NavGrouping",
-    "NavItem",
+    "KeyValueTablePanel",
+    "LayoutChoices",
     "NavMenuAddButton",
     "NavMenuBase",
     "NavMenuButton",
@@ -39,6 +64,16 @@ __all__ = (
     "NavMenuImportButton",
     "NavMenuItem",
     "NavMenuTab",
+    "ObjectDetailContent",
+    "ObjectFieldsPanel",
+    "ObjectsTablePanel",
+    "ObjectTextPanel",
+    "Panel",
     "PermissionsMixin",
+    "render_component_template",
+    "SectionChoices",
+    "StatsPanel",
+    "Tab",
     "TemplateExtension",
+    "TextPanel",
 )

nautobot/apps/utils.py

@@ -38,11 +38,6 @@ from nautobot.core.utils.lookup import (
     get_view_for_model,
 )
 from nautobot.core.utils.migrations import migrate_content_type_references_to_new_model
-from nautobot.core.utils.navigation import (
-    get_all_new_ui_ready_routes,
-    get_only_new_ui_ready_routes,
-    is_route_new_ui_ready,
-)
 from nautobot.core.utils.permissions import (
     get_permission_for_model,
     permission_is_exempt,
@@ -97,7 +92,6 @@ __all__ = (
     "foreground_color",
     "generate_signature",
     "get_all_lookup_expr_for_field",
-    "get_all_new_ui_ready_routes",
     "get_base_template",
     "get_celery_queues",
     "get_changes_for_model",
@@ -109,7 +103,6 @@ __all__ = (
     "get_form_for_model",
     "get_latest_release",
     "get_model_from_name",
-    "get_only_new_ui_ready_routes",
     "get_permission_for_model",
     "get_related_class_for_model",
     "get_related_field_for_models",
@@ -123,7 +116,6 @@ __all__ = (
     "GitRepo",
     "hex_to_rgb",
     "image_upload",
-    "is_route_new_ui_ready",
     "is_single_choice_field",
     "is_url",
     "is_uuid",

nautobot/apps/views.py

@@ -37,6 +37,7 @@ from nautobot.core.views.utils import (
     check_filter_for_display,
     csv_format,
     get_csv_form_fields_from_serializer_class,
+    get_obj_from_context,
     handle_protectederror,
     prepare_cloned_fields,
 )
@@ -60,6 +61,7 @@ __all__ = (
     "EnhancedPaginator",
     "GenericView",
     "get_csv_form_fields_from_serializer_class",
+    "get_obj_from_context",
     "get_paginate_count",
     "GetReturnURLMixin",
     "handle_protectederror",

nautobot/circuits/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -100,57 +97,3 @@ menu_items = (
         ),
     ),
 )
-
-navigation = (
-    NavContext(
-        name="Inventory",
-        groups=(
-            NavGrouping(
-                name="Circuits",
-                weight=400,
-                items=(
-                    NavItem(
-                        link="circuits:circuit_list",
-                        name="Circuits",
-                        weight=100,
-                        permissions=[
-                            "circuits.view_circuit",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:circuittermination_list",
-                        name="Circuit Terminations",
-                        weight=200,
-                        permissions=[
-                            "circuits.view_circuittermination",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:circuittype_list",
-                        name="Circuit Types",
-                        weight=300,
-                        permissions=[
-                            "circuits.view_circuittype",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:provider_list",
-                        name="Providers",
-                        weight=400,
-                        permissions=[
-                            "circuits.view_provider",
-                        ],
-                    ),
-                    NavItem(
-                        link="circuits:providernetwork_list",
-                        name="Provider Networks",
-                        weight=500,
-                        permissions=[
-                            "circuits.view_providernetwork",
-                        ],
-                    ),
-                ),
-            ),
-        ),
-    ),
-)

nautobot/circuits/tables.py

@@ -110,7 +110,6 @@ 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")
 
@@ -147,7 +146,7 @@ class CircuitTable(StatusTableMixin, BaseTable):
             "pk",
             "cid",
             "provider",
-            "circuit_type",
+            "type",
             "status",
             "tenant",
             "circuit_termination_a",

nautobot/circuits/templates/circuits/circuit_retrieve.html

@@ -4,74 +4,3 @@
 {% block extra_breadcrumbs %}
                 <li><a href="{% url 'circuits:circuit_list' %}?provider={{ object.provider.pk }}">{{ object.provider }}</a></li>
 {% endblock extra_breadcrumbs %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuit</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Status</td>
-                    <td>
-                        {{ object.status| hyperlinked_object_with_color }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Provider</td>
-                    <td>{{ object.provider|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Circuit ID</td>
-                    <td>
-                        <span class="hover_copy"><span id="copy_circuitid">{{ object.cid }}</span><button type="button" class="btn btn-inline btn-default hover_copy_button" data-clipboard-target="#copy_circuitid">
-                            <span class="mdi mdi-content-copy"></span>
-                        </button>
-                        </span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Circuit Type</td>
-                    <td>{{ object.circuit_type|hyperlinked_object }}</td>
-                </tr>
-                <tr>
-                    <td>Tenant</td>
-                    <td>
-                        {% if object.tenant and object.tenant.tenant_group %}
-                            {{ object.tenant.tenant_group|hyperlinked_object }} /
-                        {% endif %}
-                        {{ object.tenant|hyperlinked_object }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Install Date</td>
-                    <td>{{ object.install_date|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Commit Rate</td>
-                    <td>{{ object.commit_rate|humanize_speed|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description|placeholder }}</td>
-                </tr>
-            </table>
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body rendered-markdown">
-                {% if object.comments %}
-                    {{ object.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    {% include 'circuits/inc/circuit_termination.html' with termination=circuit_termination_a side='A' %}
-    {% include 'circuits/inc/circuit_termination.html' with termination=circuit_termination_z side='Z' %}
-{% endblock content_right_page %}

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

@@ -1,32 +1,12 @@
+<!--
+3.0 TODO: This template file is no longer used in Nautobot core, but is kept for now in 2.x in case an App is using it.
+In a future release, we should delete this file.
+-->
 {% load helpers %}
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <div class="pull-right">
-            {% if not termination and perms.circuits.add_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_add' circuit=object.pk %}?term_side={{ side }}" class="btn btn-xs btn-success">
-                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add
-                </a>
-            {% endif %}
-            {% if termination and perms.circuits.change_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-xs btn-warning">
-                    <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
-                </a>
-                <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}" class="btn btn-xs btn-primary">
-                    <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> Swap
-                </a>
-            {% endif %}
-            {% if termination and perms.circuits.delete_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-xs btn-danger">
-                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
-                </a>
-            {% endif %}
-            {% if termination %}
-            <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
-                <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
-            </a>
-            {% endif %}
-        </div>
+        {% include 'circuits/inc/circuit_termination_header_extra_content.html' with termination=termination %}
         <strong>Termination - {{ side }} Side</strong>
     </div>
     {% if termination %}
@@ -41,45 +21,7 @@
             <tr>
                 <td>Cable</td>
                 <td>
-                    {% 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
-                                </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>
-                        {% with peer=termination.get_cable_peer %}
-                            to
-                            {% if peer.device %}
-                                {{ peer.device|hyperlinked_object }}
-                            {% elif peer.circuit %}
-                                {{ peer.circuit|hyperlinked_object }}
-                            {% endif %}
-                            ({{ peer }})
-                        {% endwith %}
-                    {% else %}
-                        {% if perms.dcim.add_cable %}
-                            <div class="pull-right">
-                                <span class="dropdown">
-                                    <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" 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>
-                                </span>
-                            </div>
-                        {% endif %}
-                        <span class="text-muted">Not defined</span>
-                    {% endif %}
+                    {% include 'circuits/inc/circuit_termination_cable_fragment.html' %}
                 </td>
             </tr>
             {% elif termination.provider_network %}

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

@@ -0,0 +1,40 @@
+{% 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
+            </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>
+    {% with peer=termination.get_cable_peer %}
+        to
+        {% if peer.device %}
+            {{ peer.device|hyperlinked_object }}
+        {% elif peer.circuit %}
+            {{ peer.circuit|hyperlinked_object }}
+        {% endif %}
+        ({{ peer }})
+    {% endwith %}
+{% else %}
+    {% if perms.dcim.add_cable %}
+        <div class="pull-right">
+            <span class="dropdown">
+                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" 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>
+            </span>
+        </div>
+    {% endif %}
+    <span class="text-muted">Not defined</span>
+{% endif %}

nautobot/circuits/templates/circuits/inc/circuit_termination_header_extra_content.html

@@ -0,0 +1,26 @@
+{% load helpers %}
+<div class="pull-right">
+    {% if not termination and perms.circuits.add_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_add' circuit=object.pk %}?term_side={{ side }}" class="btn btn-xs btn-success">
+            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add
+        </a>
+    {% endif %}
+    {% if termination and perms.circuits.change_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}" class="btn btn-xs btn-warning">
+            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+        </a>
+        <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}" class="btn btn-xs btn-primary">
+            <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> Swap
+        </a>
+    {% endif %}
+    {% if termination and perms.circuits.delete_circuittermination %}
+        <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-xs btn-danger">
+            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
+        </a>
+    {% endif %}
+    {% if termination %}
+    <a href="{% url 'circuits:circuittermination' pk=termination.pk %}" class="btn btn-xs btn-default">
+        <span class="mdi mdi-information-outline" aria-hidden="true"></span> Detail
+    </a>
+    {% endif %}
+</div>

nautobot/circuits/templates/circuits/provider_retrieve.html

@@ -1,77 +1 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Provider</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>ASN</td>
-                    <td>{{ object.asn|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Account</td>
-                    <td>{{ object.account|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Customer Portal</td>
-                    <td>
-                        {% if object.portal_url %}
-                            <a href="{{ object.portal_url }}">{{ object.portal_url }}</a>
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>NOC Contact</td>
-                    <td class="rendered-markdown">{{ object.noc_contact|render_markdown|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Admin Contact</td>
-                    <td class="rendered-markdown">{{ object.admin_contact|render_markdown|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Circuits</td>
-                    <td>
-                        <a href="{% url 'circuits:circuit_list' %}?provider={{ object.pk }}">{{ circuits_table.rows|length }}</a>
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body rendered-markdown">
-                {% if object.comments %}
-                    {{ object.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Circuits</strong>
-            </div>
-            {% include 'inc/table.html' with table=circuits_table %}
-            {% if perms.circuits.add_circuit %}
-                <div class="panel-footer text-right noprint">
-                    <a href="{% url 'circuits:circuit_add' %}?provider={{ object.pk }}" class="btn btn-xs btn-primary">
-                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add circuit
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-        <div class="row"></div>
-{% endblock content_full_width_page %}