nautobot 3.0.0a2__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/dcim/models/device_components.py

@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Sum
 from django.utils.functional import classproperty
 
@@ -596,6 +596,86 @@ class BaseInterface(RelationshipModel):
 
         return super().save(*args, **kwargs)
 
+    def add_ip_addresses(
+        self,
+        ip_addresses,
+        is_source=False,
+        is_destination=False,
+        is_default=False,
+        is_preferred=False,
+        is_primary=False,
+        is_secondary=False,
+        is_standby=False,
+    ):
+        """Add one or more IPAddress instances to this interface's `ip_addresses` many-to-many relationship.
+
+        Args:
+            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
+            is_source (bool, optional): Is source address. Defaults to False.
+            is_destination (bool, optional): Is destination address. Defaults to False.
+            is_default (bool, optional): Is default address. Defaults to False.
+            is_preferred (bool, optional): Is preferred address. Defaults to False.
+            is_primary (bool, optional): Is primary address. Defaults to False.
+            is_secondary (bool, optional): Is secondary address. Defaults to False.
+            is_standby (bool, optional): Is standby address. Defaults to False.
+
+        Returns:
+            Number of instances added.
+        """
+        through_defaults = {
+            "is_source": is_source,
+            "is_destination": is_destination,
+            "is_default": is_default,
+            "is_preferred": is_preferred,
+            "is_primary": is_primary,
+            "is_secondary": is_secondary,
+            "is_standby": is_standby,
+        }
+
+        if not isinstance(ip_addresses, (tuple, list)):
+            ip_addresses = [ip_addresses]
+
+        # This ensures that ips_to_add only contains IPs which need to be added to the interface. This ensures
+        # that len(ips_to_add) accurately represents the results of the action.
+        ips_to_add = set(ip_addresses) - set(self.ip_addresses.all())
+
+        if ips_to_add:
+            self.ip_addresses.add(*ips_to_add, through_defaults=through_defaults)  # pylint: disable=no-member  # Intf/VMIntf both have ip_addresses
+
+        return len(ips_to_add)
+
+    add_ip_addresses.alters_data = True
+
+    def remove_ip_addresses(self, ip_addresses):
+        """Remove one or more IPAddress instances from this interface's `ip_addresses` many-to-many relationship.
+
+        Args:
+            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
+
+        Returns:
+            Number of instances removed.
+        """
+        if not isinstance(ip_addresses, (tuple, list)):
+            ip_addresses = [ip_addresses]
+
+        # The delete() call used previously (ref: https://github.com/nautobot/nautobot/issues/3236)
+        # meant that if None was passed in, it was silently ignored. Rather that raise an exception,
+        # this comprehension maintains backwards compatibility.
+        ip_addresses = {ip for ip in ip_addresses if ip is not None}
+
+        # This checks that the IPs passed in are actually on the interface. By populating
+        # ips_to_remove correctly, we ensure that the only IPs passed to remove() are IPs known
+        # to be on the interface. This ensures that len(ips_to_remove) accurately represents
+        # the results of the action.
+        ips_to_remove = ip_addresses & set(self.ip_addresses.all())
+
+        if ips_to_remove:
+            self.ip_addresses.remove(*ips_to_remove)  # pylint: disable=no-member  # Intf/VMIntf both have ip_addresses
+
+        return len(ips_to_remove)
+
+    remove_ip_addresses.alters_data = True
+
 
 @extras_features(
     "cable_terminations",
@@ -798,73 +878,6 @@ class Interface(ModularComponentModel, CableTermination, PathEndpoint, BaseInter
                         }
                     )
 
-    def add_ip_addresses(
-        self,
-        ip_addresses,
-        is_source=False,
-        is_destination=False,
-        is_default=False,
-        is_preferred=False,
-        is_primary=False,
-        is_secondary=False,
-        is_standby=False,
-    ):
-        """Add one or more IPAddress instances to this interface's `ip_addresses` many-to-many relationship.
-
-        Args:
-            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
-            is_source (bool, optional): Is source address. Defaults to False.
-            is_destination (bool, optional): Is destination address. Defaults to False.
-            is_default (bool, optional): Is default address. Defaults to False.
-            is_preferred (bool, optional): Is preferred address. Defaults to False.
-            is_primary (bool, optional): Is primary address. Defaults to False.
-            is_secondary (bool, optional): Is secondary address. Defaults to False.
-            is_standby (bool, optional): Is standby address. Defaults to False.
-
-        Returns:
-            Number of instances added.
-        """
-        if not isinstance(ip_addresses, (tuple, list)):
-            ip_addresses = [ip_addresses]
-        with transaction.atomic():
-            for ip in ip_addresses:
-                instance = self.ip_addresses.through(
-                    ip_address=ip,
-                    interface=self,
-                    is_source=is_source,
-                    is_destination=is_destination,
-                    is_default=is_default,
-                    is_preferred=is_preferred,
-                    is_primary=is_primary,
-                    is_secondary=is_secondary,
-                    is_standby=is_standby,
-                )
-                instance.validated_save()
-        return len(ip_addresses)
-
-    add_ip_addresses.alters_data = True
-
-    def remove_ip_addresses(self, ip_addresses):
-        """Remove one or more IPAddress instances from this interface's `ip_addresses` many-to-many relationship.
-
-        Args:
-            ip_addresses (:obj:`list` or `IPAddress`): Instance of `nautobot.ipam.models.IPAddress` or list of `IPAddress` instances.
-
-        Returns:
-            Number of instances removed.
-        """
-        count = 0
-        if not isinstance(ip_addresses, (tuple, list)):
-            ip_addresses = [ip_addresses]
-        with transaction.atomic():
-            for ip in ip_addresses:
-                qs = self.ip_addresses.through.objects.filter(ip_address=ip, interface=self)
-                deleted_count, _ = qs.delete()
-                count += deleted_count
-        return count
-
-    remove_ip_addresses.alters_data = True
-
     @property
     def is_connectable(self):
         return self.type not in NONCONNECTABLE_IFACE_TYPES

nautobot/dcim/models/devices.py

@@ -25,6 +25,7 @@ from nautobot.dcim.choices import (
     ControllerCapabilitiesChoices,
     DeviceFaceChoices,
     DeviceRedundancyGroupFailoverStrategyChoices,
+    DeviceUniquenessChoices,
     SoftwareImageFileHashingAlgorithmChoices,
     SubdeviceRoleChoices,
 )
@@ -682,19 +683,20 @@ class Device(PrimaryModel, ConfigContextModel):
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def natural_key_field_names(cls):  # pylint: disable=no-self-argument
         """
-        When DEVICE_NAME_AS_NATURAL_KEY is set in settings or Constance, we use just the `name` for simplicity.
+        Check DEVICE_UNIQUENESS from settings or Constance and return proper field.
         """
-        if get_settings_or_config("DEVICE_NAME_AS_NATURAL_KEY"):
-            # opt-in simplified "pseudo-natural-key"
+        if get_settings_or_config("DEVICE_UNIQUENESS") == DeviceUniquenessChoices.NAME:
+            # Simplified pseudo-natural key (opt-in for name-only uniqueness)
             return ["name"]
+        elif get_settings_or_config("DEVICE_UNIQUENESS") == DeviceUniquenessChoices.LOCATION_TENANT_NAME:
+            # Full natural key based on tenant, location, and name
+            return ["name", "tenant", "location"]
         else:
-            # true natural-key given current uniqueness constraints
-            return ["name", "tenant", "location"]  # location should be last since it's potentially variadic
+            return ["pk"]
 
     class Meta:
         ordering = ("_name",)  # Name may be null
         unique_together = (
-            ("location", "tenant", "name"),  # See validate_unique below
             ("rack", "position", "face"),
             ("virtual_chassis", "vc_position"),
         )
@@ -716,16 +718,6 @@ class Device(PrimaryModel, ConfigContextModel):
         else:
             self.clusters.set([cluster])
 
-    def validate_unique(self, exclude=None):
-        # Check for a duplicate name on a device assigned to the same Location and no Tenant. This is necessary
-        # because Django does not consider two NULL fields to be equal, and thus will not trigger a violation
-        # of the uniqueness constraint without manual intervention.
-        if self.name and hasattr(self, "location") and self.tenant is None:
-            if Device.objects.exclude(pk=self.pk).filter(name=self.name, location=self.location, tenant__isnull=True):
-                raise ValidationError({"name": "A device with this name already exists."})
-
-        super().validate_unique(exclude)
-
     def clean(self):
         from nautobot.ipam import models as ipam_models  # circular import workaround
 
@@ -909,6 +901,11 @@ class Device(PrimaryModel, ConfigContextModel):
     def save(self, *args, **kwargs):
         is_new = not self.present_in_database
 
+        # to avoid circular import
+        from nautobot.dcim.custom_validators import DeviceUniquenessValidator
+
+        DeviceUniquenessValidator(self).clean()
+
         super().save(*args, **kwargs)
 
         # Apply any pending cluster assignment that was deferred during creation

nautobot/dcim/navigation.py

@@ -4,12 +4,13 @@ from nautobot.core.apps import (
     NavMenuItem,
     NavMenuTab,
 )
+from nautobot.core.ui.choices import NavigationIconChoices, NavigationWeightChoices
 
 menu_items = (
     NavMenuTab(
         name="Organization",
-        icon="briefcase-2",
-        weight=100,
+        icon=NavigationIconChoices.ORGANIZATION,
+        weight=NavigationWeightChoices.ORGANIZATION,
         groups=(
             NavMenuGroup(
                 name="Locations",
@@ -116,8 +117,8 @@ menu_items = (
     ),
     NavMenuTab(
         name="Devices",
-        icon="laptop",
-        weight=200,
+        icon=NavigationIconChoices.DEVICES,
+        weight=NavigationWeightChoices.DEVICES,
         groups=(
             NavMenuGroup(
                 name="Devices",
@@ -549,8 +550,8 @@ menu_items = (
     ),
     NavMenuTab(
         name="Power",
-        icon="lightning",
-        weight=600,
+        icon=NavigationIconChoices.POWER,
+        weight=NavigationWeightChoices.POWER,
         groups=(
             NavMenuGroup(
                 name="Power",

nautobot/dcim/tables/devices.py

@@ -295,6 +295,7 @@ class DeviceImportTable(StatusTableMixin, RoleTableMixin, BaseTable):
 
 class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
     pk = ToggleColumn()
+    id = tables.Column(linkify=True, verbose_name="ID")
     module_type = tables.Column(
         linkify=lambda record: record.module_type.get_absolute_url(),
         verbose_name="Type",
@@ -315,6 +316,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
         model = Module
         fields = (
             "pk",
+            "id",
             "module_type",
             "module_family",
             "parent_module_bay",
@@ -329,6 +331,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
         )
         default_columns = (
             "pk",
+            "id",
             "module_type",
             "module_family",
             "parent_module_bay",

nautobot/dcim/tables/template_code.py

@@ -137,8 +137,8 @@ CONSOLEPORT_BUTTONS = """
     <li><a href="{% url 'dcim:consoleport_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:consoleport_connect' termination_a_id=record.pk termination_b_type='console-server-port' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -165,8 +165,8 @@ CONSOLESERVERPORT_BUTTONS = """
     <li><a href="{% url 'dcim:consoleserverport_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:consoleserverport_connect' termination_a_id=record.pk termination_b_type='console-port' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -193,8 +193,8 @@ POWERPORT_BUTTONS = """
     <li><a href="{% url 'dcim:powerport_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-outlet' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -215,8 +215,8 @@ POWEROUTLET_BUTTONS = """
     <li><a href="{% url 'dcim:poweroutlet_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:poweroutlet_connect' termination_a_id=record.pk termination_b_type='power-port' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -239,8 +239,8 @@ INTERFACE_BUTTONS = """
     <li><a href="{% url 'dcim:interface_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span><Trace/a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif record.is_connectable and perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:interface_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -273,8 +273,8 @@ FRONTPORT_BUTTONS = """
     <li><a href="{% url 'dcim:frontport_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:frontport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>
@@ -319,8 +319,8 @@ REARPORT_BUTTONS = """
     <li><a href="{% url 'dcim:rearport_trace' pk=record.pk %}" class="dropdown-item text-primary"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
     {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
 {% elif perms.dcim.add_cable %}
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
-    <li><a href="#" class="dropdown-item disabled"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-transit-connection-variant" aria-hidden="true"></span>Trace</a></li>
+    <li><a class="dropdown-item disabled" aria-disabled="true"><span class="mdi mdi-lan-connect" aria-hidden="true"></span>Mark installed</a></li>
     <li>
         <a href="{% url 'dcim:rearport_connect' termination_a_id=record.pk termination_b_type='interface' %}?return_url={{ request.path }}" class="dropdown-item text-success">
             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span>

nautobot/dcim/templates/dcim/cable.html

@@ -1,61 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="card">
-        <div class="card-header">
-            <strong>Cable</strong>
-        </div>
-        <table class="table table-hover card-body attr-table">
-            <tr>
-                <td>Type</td>
-                <td>{{ object.get_type_display|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Status</td>
-                <td>
-                    {{ object.status| hyperlinked_object_with_color }}
-                </td>
-            </tr>
-            <tr>
-                <td>Label</td>
-                <td>{{ object.label|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Color</td>
-                <td>
-                    {% if object.color %}
-                        <span class="label nb-color-block" style="background-color: #{{ object.color }}">&nbsp;</span>
-                    {% else %}
-                        <span class="text-secondary">&mdash;</span>
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td>Length</td>
-                <td>
-                    {% if object.length %}
-                        {{ object.length }} {{ object.get_length_unit_display }}
-                    {% else %}
-                        <span class="text-secondary">&mdash;</span>
-                    {% endif %}
-                </td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="card">
-        <div class="card-header">
-            <strong>Termination A</strong>
-        </div>
-        {% include 'dcim/inc/cable_termination.html' with termination=object.termination_a %}
-    </div>
-    <div class="card">
-        <div class="card-header">
-            <strong>Termination B</strong>
-        </div>
-        {% include 'dcim/inc/cable_termination.html' with termination=object.termination_b %}
-    </div>
-{% endblock content_right_page %}
+{% extends 'dcim/cable_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/cable_connect.html

@@ -3,6 +3,16 @@
 {% load helpers %}
 {% load form_helpers %}
 
+{% block title %}
+    {% with termination_a=form.instance.termination_a %}
+        {% if termination_a.module %}
+            Connect {{ termination_a.module.display }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+        {% else %}
+            Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+        {% endif %}
+    {% endwith %}
+{% endblock %}
+
 {% block content %}
     <form method="post" class="h-100 vstack">
         {% csrf_token %}
@@ -21,15 +31,6 @@
                 </div>
             {% endif %}
             {% with termination_a=form.instance.termination_a %}
-                <h3 class="mb-16">
-                    {% block title %}
-                        {% if termination_a.module %}
-                            Connect {{ termination_a.module.display }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
-                        {% else %}
-                            Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
-                        {% endif %}
-                    {% endblock %}
-                </h3>
                 <div class="col-lg-5">
                     <div class="card">
                         <div class="card-header">
@@ -38,36 +39,11 @@
                         <div class="card-body">
                             {% if termination_a.device %}
                             {# Device component #}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device.location }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Rack</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device.rack|default:"None" }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Device</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Name</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Location" value=termination_a.device.location required=True %}
+                                {% include "inc/form_static_field.html" with label="Rack" value=termination_a.device.rack|default:"None" required=True %}
+                                {% include "inc/form_static_field.html" with label="Device" value=termination_a.device required=True %}
+                                {% include "inc/form_static_field.html" with label="Type" value=termination_a|meta:"verbose_name"|bettertitle required=True %}
+                                {% include "inc/form_static_field.html" with label="Name" value=termination_a required=True %}
                             {% elif termination_a.module %}
                             {# Module component #}
                                 {% if not termination_a.module.device %}
@@ -75,76 +51,21 @@
                                         This {{ termination_a|meta:"verbose_name"|bettertitle }} belongs
                                         to a module not installed in any device.
                                     </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.location }}</p>
-                                        </div>
-                                    </div>
+                                    {% include "inc/form_static_field.html" with label="Location" value=termination_a.module.location required=True %}
                                 {% else %}
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device.location }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Rack</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device.rack|default:"None" }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Device</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Module</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.display }}</p>
-                                        </div>
-                                    </div>
+                                    {% include "inc/form_static_field.html" with label="Location" value=termination_a.module.device.location required=True %}
+                                    {% include "inc/form_static_field.html" with label="Rack" value=termination_a.module.device.rack|default:"None" required=True %}
+                                    {% include "inc/form_static_field.html" with label="Device" value=termination_a.module.device required=True %}
+                                    {% include "inc/form_static_field.html" with label="Module" value=termination_a.module.display required=True %}
                                 {% endif %}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Name</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Type" value=termination_a|meta:"verbose_name"|bettertitle required=True %}
+                                {% include "inc/form_static_field.html" with label="Name" value=termination_a required=True %}
                             {% else %}
                             {# Circuit termination #}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.location }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Provider</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.circuit.provider }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Circuit</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.circuit.cid }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Side</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.term_side }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Location" value=termination_a.location required=True %}
+                                {% include "inc/form_static_field.html" with label="Provider" value=termination_a.circuit.provider required=True %}
+                                {% include "inc/form_static_field.html" with label="Circuit" value=termination_a.circuit.cid required=True %}
+                                {% include "inc/form_static_field.html" with label="Side" value=termination_a.term_side required=True %}
                             {% endif %}
                         </div>
                     </div>
@@ -192,17 +113,12 @@
                             {% if 'termination_b_circuit' in form.fields %}
                                 {% render_field form.termination_b_circuit %}
                             {% endif %}
-                            <div class="mb-10 d-flex justify-content-center">
-                                <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                <div class="col-lg-9">
-                                    <p class="form-control-plaintext">{{ termination_b_type|bettertitle }}</p>
-                                </div>
-                            </div>
+                            {% include "inc/form_static_field.html" with label="Type" value=termination_b_type|bettertitle required=True %}
                             {% render_field form.termination_b_id %}
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-6 offset-md-3">
+                <div class="col-lg-6 offset-lg-3">
                     {% include 'dcim/inc/cable_form.html' %}
                 </div>
             {% endwith %}

nautobot/dcim/templates/dcim/cable_edit.html

@@ -1,5 +1,2 @@
-{% extends 'generic/object_create.html' %}
-
-{% block form %}
-    {% include 'dcim/inc/cable_form.html' %}
-{% endblock %}
+{% extends 'dcim/cable_update.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}