nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/core/utils/git.py

@@ -6,6 +6,8 @@ import os
 
 from git import Repo
 
+from nautobot.core.utils.logging import sanitize
+
 logger = logging.getLogger(__name__)
 
 # namedtuple takes a git log diff status and its accompanying text.
@@ -63,6 +65,8 @@ class GitRepo:
             url (str): git repo url
             clone_initially (bool): True if the repo needs to be cloned
         """
+        self.url = url
+        self.sanitized_url = sanitize(url)
         if os.path.isdir(path) and os.path.isdir(os.path.join(path, ".git")):
             self.repo = Repo(path=path)
         elif clone_initially:
@@ -118,7 +122,7 @@ class GitRepo:
                 branch_head.set_tracking_branch(self.repo.remotes.origin.refs[branch])
             except IndexError as git_error:
                 logger.error(
-                    "Branch %s does not exist at %s. %s", branch, list(self.repo.remotes.origin.urls)[0], git_error
+                    "Branch %s does not exist at %s. %s", branch, next(iter(self.repo.remotes.origin.urls)), git_error
                 )
                 raise BranchDoesNotExist(
                     f"Please create branch '{branch}' in upstream and try again."
@@ -143,7 +147,7 @@ class GitRepo:
             self.repo.remotes.origin.refs[branch]
         except IndexError as git_error:
             logger.error(
-                "Branch %s does not exist at %s. %s", branch, list(self.repo.remotes.origin.urls)[0], git_error
+                "Branch %s does not exist at %s. %s", branch, next(iter(self.repo.remotes.origin.urls)), git_error
             )
             raise BranchDoesNotExist(
                 f"Please create branch '{branch}' in upstream and try again."

nautobot/core/utils/logging.py

@@ -17,7 +17,8 @@ def sanitize(string, replacement="(redacted)"):
     Uses settings.SANITIZER_PATTERNS as the list of (regexp, repl) tuples to apply.
     """
     # Don't allow regex match groups to be referenced in the replacement string!
-    assert not re.search(r"\\\d|\\g<\d+>", replacement)
+    if re.search(r"\\\d|\\g<\d+>", replacement):
+        raise RuntimeError("Invalid replacement string! Must not contain regex match group references.")
 
     for sanitizer, repl in settings.SANITIZER_PATTERNS:
         try:

nautobot/core/utils/lookup.py

@@ -2,6 +2,7 @@
 
 import inspect
 
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
@@ -36,7 +37,6 @@ def get_model_from_name(model_name):
 
     :return: Found model.
     """
-    from django.apps import apps
 
     try:
         return apps.get_model(model_name)
@@ -90,7 +90,7 @@ def get_route_for_model(model, action, api=False):
         sep = "_" if not api else "-"
     viewname = f"{prefix}{sep}{action}"
 
-    if model._meta.app_label in settings.PLUGINS:
+    if apps.get_app_config(app_label).name in settings.PLUGINS:
         viewname = f"plugins{suffix}:{viewname}"
 
     return viewname
@@ -125,11 +125,9 @@ def get_related_class_for_model(model, module_name, object_suffix):
         raise TypeError(f"{model!r} is not a subclass of a Django Model class")
 
     # e.g. "nautobot.dcim.forms.DeviceFilterForm"
-    app_label = model._meta.app_label
+    app_config = apps.get_app_config(model._meta.app_label)
     object_name = f"{model.__name__}{object_suffix}"
-    object_path = f"{app_label}.{module_name}.{object_name}"
-    if app_label not in settings.PLUGINS:
-        object_path = f"nautobot.{object_path}"
+    object_path = f"{app_config.name}.{module_name}.{object_name}"
 
     try:
         return import_string(object_path)

nautobot/core/utils/migrations.py

@@ -1,4 +1,5 @@
 import sys
+
 from django.db import models
 
 

nautobot/core/utils/permissions.py

@@ -58,12 +58,10 @@ def permission_is_exempt(name):
     if action == "view":
         if (
             # All models (excluding those in EXEMPT_EXCLUDE_MODELS) are exempt from view permission enforcement
-            "*" in settings.EXEMPT_VIEW_PERMISSIONS
-            and (app_label, model_name) not in settings.EXEMPT_EXCLUDE_MODELS
+            "*" in settings.EXEMPT_VIEW_PERMISSIONS and (app_label, model_name) not in settings.EXEMPT_EXCLUDE_MODELS
         ) or (
             # This specific model is exempt from view permission enforcement
-            f"{app_label}.{model_name}"
-            in settings.EXEMPT_VIEW_PERMISSIONS
+            f"{app_label}.{model_name}" in settings.EXEMPT_VIEW_PERMISSIONS
         ):
             return True
 

nautobot/core/utils/requests.py

@@ -1,6 +1,8 @@
 import re
+from urllib.parse import parse_qs, urlencode, urlparse
 
 from django import forms
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.http import QueryDict
@@ -170,3 +172,11 @@ def normalize_querydict(querydict, form_class=None):
                 # Only a single value in the querydict for this key, and no guidance otherwise, so make it single
                 result[key] = value_list[0]
     return result
+
+
+def add_nautobot_version_query_param_to_url(url):
+    parsed_url = urlparse(url)
+    params = parse_qs(parsed_url.query)
+    params["version"] = settings.VERSION
+    updated_query = urlencode(params, doseq=True)
+    return parsed_url._replace(query=updated_query).geturl()

nautobot/core/views/__init__.py

@@ -3,21 +3,24 @@ import platform
 import sys
 import time
 
+from db_file_storage.views import get_file
 from django.apps import apps
-import prometheus_client
 from django.conf import settings
-from django.contrib.auth.mixins import AccessMixin
-from django.http import HttpResponseServerError, JsonResponse, HttpResponseForbidden, HttpResponse
-from django.shortcuts import redirect, render
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.mixins import AccessMixin, LoginRequiredMixin
+from django.contrib.contenttypes.models import ContentType
+from django.http import HttpResponse, HttpResponseForbidden, HttpResponseServerError, JsonResponse
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader, RequestContext, Template
 from django.template.exceptions import TemplateDoesNotExist
 from django.urls import resolve, reverse
+from django.views.csrf import csrf_failure as _csrf_failure
 from django.views.decorators.csrf import requires_csrf_token
 from django.views.defaults import ERROR_500_TEMPLATE_NAME, page_not_found
-from django.views.csrf import csrf_failure as _csrf_failure
 from django.views.generic import TemplateView, View
-from packaging import version
 from graphene_django.views import GraphQLView
+from packaging import version
+import prometheus_client
 from prometheus_client import multiprocess
 from prometheus_client.metrics_core import GaugeMetricFamily
 from prometheus_client.registry import Collector
@@ -26,9 +29,10 @@ from nautobot.core.constants import SEARCH_MAX_RESULTS
 from nautobot.core.forms import SearchForm
 from nautobot.core.releases import get_latest_release
 from nautobot.core.utils.lookup import get_route_for_model
-from nautobot.extras.models import GraphQLQuery
-from nautobot.extras.registry import registry
+from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.extras.forms import GraphQLQueryForm
+from nautobot.extras.models import FileProxy, GraphQLQuery, Status
+from nautobot.extras.registry import registry
 
 
 class HomeView(AccessMixin, TemplateView):
@@ -109,6 +113,16 @@ class HomeView(AccessMixin, TemplateView):
         return self.render_to_response(context)
 
 
+class ThemePreviewView(LoginRequiredMixin, TemplateView):
+    template_name = "utilities/theme_preview.html"
+
+    def get_context_data(self, **kwargs):
+        return {
+            "content_type": ContentType.objects.get_for_model(Status),
+            "object": Status.objects.first(),
+        }
+
+
 class SearchView(AccessMixin, View):
     def get(self, request):
         # if user is not authenticated, redirect to login page
@@ -293,3 +307,13 @@ def nautobot_metrics_view(request):
         pass
     metrics_page = prometheus_client.generate_latest(prometheus_registry)
     return HttpResponse(metrics_page, content_type=prometheus_client.CONTENT_TYPE_LATEST)
+
+
+@permission_required(get_permission_for_model(FileProxy, "view"), raise_exception=True)
+def get_file_with_authorization(request, *args, **kwargs):
+    """Patch db_file_storage view with authentication."""
+    # Make sure user has permissions
+    queryset = FileProxy.objects.restrict(request.user, "view")
+    get_object_or_404(queryset, file=request.GET.get("name"))
+
+    return get_file(request, *args, **kwargs)

nautobot/core/views/generic.py

@@ -11,20 +11,20 @@ from django.core.exceptions import (
     ObjectDoesNotExist,
     ValidationError,
 )
-from django.db import transaction, IntegrityError
+from django.db import IntegrityError, transaction
 from django.db.models import ManyToManyField, ProtectedError
 from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.encoding import iri_to_uri
 from django.utils.html import format_html
-from django.utils.http import is_safe_url
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.views.generic import View
 from django_tables2 import RequestConfig
 from rest_framework.exceptions import ParseError
 
 from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.utils import get_serializer_for_model
-from nautobot.core.forms import SearchForm
 from nautobot.core.exceptions import AbortTransaction
 from nautobot.core.forms import (
     BootstrapMixin,
@@ -33,8 +33,9 @@ from nautobot.core.forms import (
     CSVDataField,
     CSVFileField,
     ImportForm,
-    TableConfigForm,
     restrict_form_fields,
+    SearchForm,
+    TableConfigForm,
 )
 from nautobot.core.forms.forms import DynamicFilterFormSet
 from nautobot.core.templatetags.helpers import bettertitle, validated_viewname
@@ -46,8 +47,8 @@ from nautobot.core.utils.requests import (
     get_filterable_params_from_filter_params,
     normalize_querydict,
 )
-from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.mixins import GetReturnURLMixin, ObjectPermissionRequiredMixin
+from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import (
     check_filter_for_display,
     get_csv_form_fields_from_serializer_class,
@@ -400,9 +401,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         verb = "Created" if created else "Modified"
         msg = f"{verb} {self.queryset.model._meta.verbose_name}"
         logger.info(f"{msg} {obj} (PK: {obj.pk})")
-        if hasattr(obj, "get_absolute_url"):
+        try:
             msg = format_html('{} <a href="{}">{}</a>', msg, obj.get_absolute_url(), obj)
-        else:
+        except AttributeError:
             msg = format_html("{} {}", msg, obj)
         messages.success(request, msg)
 
@@ -437,8 +438,8 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                     return redirect(request.get_full_path())
 
                 return_url = form.cleaned_data.get("return_url")
-                if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                    return redirect(return_url)
+                if url_has_allowed_host_and_scheme(url=return_url, allowed_hosts=request.get_host()):
+                    return redirect(iri_to_uri(return_url))
                 else:
                     return redirect(self.get_return_url(request, obj))
 
@@ -521,8 +522,8 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             messages.success(request, msg)
 
             return_url = form.cleaned_data.get("return_url")
-            if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                return redirect(return_url)
+            if url_has_allowed_host_and_scheme(url=return_url, allowed_hosts=request.get_host()):
+                return redirect(iri_to_uri(return_url))
             else:
                 return redirect(self.get_return_url(request, obj))
 
@@ -763,8 +764,8 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                     return redirect(request.get_full_path())
 
                 return_url = form.cleaned_data.get("return_url")
-                if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                    return redirect(return_url)
+                if url_has_allowed_host_and_scheme(url=return_url, allowed_hosts=request.get_host()):
+                    return redirect(iri_to_uri(return_url))
                 else:
                     return redirect(self.get_return_url(request, obj))
 

nautobot/core/views/mixins.py

@@ -2,8 +2,8 @@ from io import BytesIO
 import logging
 
 from django.contrib import messages
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.mixins import AccessMixin
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import (
     FieldDoesNotExist,
     ImproperlyConfigured,
@@ -18,18 +18,17 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import select_template, TemplateDoesNotExist
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
-from django.utils.http import is_safe_url
+from django.utils.encoding import iri_to_uri
 from django.utils.html import format_html
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.views.generic.edit import FormView
-
-from rest_framework import mixins, exceptions
+from drf_spectacular.utils import extend_schema
+from rest_framework import exceptions, mixins
 from rest_framework.decorators import action as drf_action
 from rest_framework.parsers import FormParser, MultiPartParser
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
-from drf_spectacular.utils import extend_schema
-
 from nautobot.core.api.parsers import NautobotCSVParser
 from nautobot.core.api.views import BulkDestroyModelMixin, BulkUpdateModelMixin
 from nautobot.core.forms import (
@@ -40,16 +39,16 @@ from nautobot.core.forms import (
     restrict_form_fields,
 )
 from nautobot.core.utils import lookup, permissions
-from nautobot.core.views.renderers import NautobotHTMLRenderer
 from nautobot.core.utils.requests import get_filterable_params_from_filter_params
+from nautobot.core.views.renderers import NautobotHTMLRenderer
 from nautobot.core.views.utils import (
     get_csv_form_fields_from_serializer_class,
     handle_protectederror,
     prepare_cloned_fields,
 )
-from nautobot.extras.models import ExportTemplate
 from nautobot.extras.forms import NoteForm
-from nautobot.extras.tables import ObjectChangeTable, NoteTable
+from nautobot.extras.models import ExportTemplate
+from nautobot.extras.tables import NoteTable, ObjectChangeTable
 from nautobot.extras.utils import remove_prefix_from_cf_key
 
 PERMISSIONS_ACTION_MAP = {
@@ -178,8 +177,8 @@ class GetReturnURLMixin:
         # First, see if `return_url` was specified as a query parameter or form data. Use this URL only if it's
         # considered safe.
         query_param = request.GET.get("return_url") or request.POST.get("return_url")
-        if query_param and is_safe_url(url=query_param, allowed_hosts=request.get_host()):
-            return query_param
+        if url_has_allowed_host_and_scheme(url=query_param, allowed_hosts=request.get_host()):
+            return iri_to_uri(query_param)
 
         # Next, check if the object being modified (if any) has an absolute URL.
         # Note that the use of both `obj.present_in_database` and `obj.pk` is correct here because this conditional
@@ -240,8 +239,6 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         """
         model_permissions = []
         for action in actions:
-            if action not in ("view", "add", "change", "delete"):
-                raise ValueError(f"Unsupported action: {action}")
             model_permissions.append(f"{model._meta.app_label}.{action}_{model._meta.model_name}")
         return model_permissions
 
@@ -251,7 +248,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         """
         queryset = self.get_queryset()
         try:
-            actions = [PERMISSIONS_ACTION_MAP[self.action]]
+            actions = [self.get_action()]
         except KeyError:
             messages.error(
                 self.request,
@@ -306,9 +303,10 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         elif self.action == "changelog":
             return ObjectChangeTable
 
-        assert (
-            self.table_class is not None
-        ), f"'{self.__class__.__name__}' should include a `table_class` attribute for bulk operations"
+        if self.table_class is None:
+            raise NotImplementedError(
+                f"'{self.__class__.__name__}' should include a `table_class` attribute for bulk operations"
+            )
 
         return self.table_class
 
@@ -472,7 +470,11 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         Override the original `get_queryset()` to apply permission specific to the user and action.
         """
         queryset = super().get_queryset()
-        return queryset.restrict(self.request.user, PERMISSIONS_ACTION_MAP[self.action])
+        return queryset.restrict(self.request.user, self.get_action())
+
+    def get_action(self):
+        """Helper method for retrieving action and if action not set defaulting to action name."""
+        return PERMISSIONS_ACTION_MAP.get(self.action, self.action)
 
     def get_extra_context(self, request, instance=None):
         """
@@ -748,9 +750,9 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
 
             msg = f'{"Created" if object_created else "Modified"} {queryset.model._meta.verbose_name}'
             self.logger.info(f"{msg} {obj} (PK: {obj.pk})")
-            if hasattr(obj, "get_absolute_url"):
+            try:
                 msg = format_html('{} <a href="{}">{}</a>', msg, obj.get_absolute_url(), obj)
-            else:
+            except AttributeError:
                 msg = format_html("{} {}", msg, obj)
             messages.success(request, msg)
             if "_addanother" in request.POST:
@@ -761,8 +763,8 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
                 self.success_url = request.get_full_path()
             else:
                 return_url = form.cleaned_data.get("return_url")
-                if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                    self.success_url = return_url
+                if url_has_allowed_host_and_scheme(url=return_url, allowed_hosts=request.get_host()):
+                    self.success_url = iri_to_uri(return_url)
                 else:
                     self.success_url = self.get_return_url(request, obj)
 

nautobot/core/views/renderers.py

@@ -7,9 +7,9 @@ from django_tables2 import RequestConfig
 from rest_framework import renderers
 
 from nautobot.core.forms import (
+    restrict_form_fields,
     SearchForm,
     TableConfigForm,
-    restrict_form_fields,
 )
 from nautobot.core.forms.forms import DynamicFilterFormSet
 from nautobot.core.templatetags.helpers import bettertitle, validated_viewname

nautobot/core/views/routers.py

@@ -52,6 +52,12 @@ class NautobotUIViewSetRouter(SimpleRouter):
             detail=False,
             initkwargs={"suffix": "Bulk Delete"},
         ),
+        DynamicRoute(
+            url=r"^{prefix}/{url_path}{trailing_slash}$",
+            name="{basename}_{url_name}",
+            detail=False,
+            initkwargs={},
+        ),
         Route(
             url=r"^{prefix}/{lookup}/$",
             mapping={"get": "retrieve"},

nautobot/core/views/utils.py

@@ -5,7 +5,6 @@ from django.core.exceptions import FieldError
 from django.db.models import ForeignKey
 from django.utils.html import format_html, format_html_join
 from django.utils.safestring import mark_safe
-
 from rest_framework import serializers
 
 from nautobot.core.api.fields import ChoiceField, ContentTypeField, TimeZoneSerializerField
@@ -97,6 +96,8 @@ def get_csv_form_fields_from_serializer_class(serializer_class):
     """From the given serializer class, build a list of field dicts suitable for rendering in the CSV import form."""
     serializer = serializer_class(context={"request": None, "depth": 0})
     fields = []
+    # Note lots of "noqa: S308" in this function. That's `suspicious-mark-safe-usage`, but in all of the below cases
+    # we control the input string and it's known to be safe, so mark_safe() is being used correctly here.
     for field_name, field in serializer.fields.items():
         if field.read_only:
             continue

nautobot/dcim/api/urls.py

@@ -1,6 +1,6 @@
 from nautobot.core.api.routers import OrderedDefaultRouter
-from . import views
 
+from . import views
 
 router = OrderedDefaultRouter()
 router.APIRootView = views.DCIMRootView

nautobot/dcim/api/views.py

@@ -1,10 +1,10 @@
-import socket
 from collections import OrderedDict
+import socket
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F
-from django.http import HttpResponseForbidden, HttpResponse
+from django.http import HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404
 from django.views.decorators.clickjacking import xframe_options_sameorigin
 from drf_spectacular.types import OpenApiTypes
@@ -39,10 +39,10 @@ from nautobot.dcim.models import (
     InterfaceRedundancyGroup,
     InterfaceRedundancyGroupAssociation,
     InterfaceTemplate,
+    InventoryItem,
     Location,
     LocationType,
     Manufacturer,
-    InventoryItem,
     Platform,
     PowerFeed,
     PowerOutlet,
@@ -65,6 +65,7 @@ from nautobot.extras.choices import SecretsGroupAccessTypeChoices, SecretsGroupS
 from nautobot.extras.secrets.exceptions import SecretError
 from nautobot.ipam.models import Prefix, VLAN
 from nautobot.virtualization.models import VirtualMachine
+
 from . import serializers
 from .exceptions import MissingFilterException
 
@@ -468,9 +469,9 @@ class DeviceViewSet(ConfigContextQuerySetMixin, NautobotModelViewSet):
         # Get NAPALM enable-secret from the device if present
         if device.secrets_group:
             # Work around inconsistent enable password arg in NAPALM drivers
-            enable_password_arg = "secret"
+            enable_password_arg = "secret"  # noqa: S105  # hardcoded-password-string -- false positive
             if device.platform.napalm_driver.lower() == "eos":
-                enable_password_arg = "enable_password"
+                enable_password_arg = "enable_password"  # noqa: S105  # hardcoded-password-string -- false positive
             try:
                 optional_args[enable_password_arg] = device.secrets_group.get_secret_value(
                     SecretsGroupAccessTypeChoices.TYPE_GENERIC,

nautobot/dcim/apps.py

@@ -17,4 +17,4 @@ class DCIMConfig(NautobotConfig):
 
     def ready(self):
         super().ready()
-        import nautobot.dcim.signals  # noqa: F401
+        import nautobot.dcim.signals  # noqa: F401  # unused-import -- but this import installs the signals

nautobot/dcim/choices.py

@@ -1,6 +1,5 @@
 from nautobot.core.choices import ChoiceSet
 
-
 #
 # Locations
 #
@@ -753,6 +752,7 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_100GE_QSFP28 = "100gbase-x-qsfp28"
     TYPE_200GE_CFP2 = "200gbase-x-cfp2"
     TYPE_200GE_QSFP56 = "200gbase-x-qsfp56"
+    TYPE_400GE_QSFP112 = "400gbase-x-qsfp112"
     TYPE_400GE_QSFP_DD = "400gbase-x-qsfpdd"
     TYPE_400GE_OSFP = "400gbase-x-osfp"
     TYPE_800GE_QSFP_DD = "800gbase-x-qsfpdd"
@@ -897,6 +897,7 @@ class InterfaceTypeChoices(ChoiceSet):
                 (TYPE_100GE_CPAK, "Cisco CPAK (100GE)"),
                 (TYPE_100GE_QSFP28, "QSFP28 (100GE)"),
                 (TYPE_200GE_QSFP56, "QSFP56 (200GE)"),
+                (TYPE_400GE_QSFP112, "QSFP112 (400GE)"),
                 (TYPE_400GE_QSFP_DD, "QSFP-DD (400GE)"),
                 (TYPE_400GE_OSFP, "OSFP (400GE)"),
                 (TYPE_800GE_QSFP_DD, "QSFP-DD (800GE)"),
@@ -1181,6 +1182,7 @@ class CableTypeChoices(ChoiceSet):
     TYPE_MMF_OM2 = "mmf-om2"
     TYPE_MMF_OM3 = "mmf-om3"
     TYPE_MMF_OM4 = "mmf-om4"
+    TYPE_MMF_OM5 = "mmf-om5"
     TYPE_SMF = "smf"
     TYPE_SMF_OS1 = "smf-os1"
     TYPE_SMF_OS2 = "smf-os2"
@@ -1214,6 +1216,7 @@ class CableTypeChoices(ChoiceSet):
                 (TYPE_MMF_OM2, "Multimode Fiber (OM2)"),
                 (TYPE_MMF_OM3, "Multimode Fiber (OM3)"),
                 (TYPE_MMF_OM4, "Multimode Fiber (OM4)"),
+                (TYPE_MMF_OM5, "Multimode Fiber (OM5)"),
                 (TYPE_SMF, "Singlemode Fiber"),
                 (TYPE_SMF_OS1, "Singlemode Fiber (OS1)"),
                 (TYPE_SMF_OS2, "Singlemode Fiber (OS2)"),

nautobot/dcim/constants.py

@@ -2,7 +2,6 @@ from django.db.models import Q
 
 from .choices import InterfaceTypeChoices
 
-
 #
 # Racks
 #

nautobot/dcim/elevations.py

@@ -1,8 +1,7 @@
-import svgwrite
-
 from django.conf import settings
 from django.urls import reverse
 from django.utils.http import urlencode
+import svgwrite
 
 from .choices import DeviceFaceChoices
 from .constants import RACK_ELEVATION_BORDER_WIDTH