nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__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
 
@@ -20,6 +20,7 @@ from nautobot.core.utils.cache import construct_cache_key
 from nautobot.core.utils.data import UtilizationData
 from nautobot.dcim.choices import (
     ConsolePortTypeChoices,
+    InterfaceDuplexChoices,
     InterfaceModeChoices,
     InterfaceRedundancyGroupProtocolChoices,
     InterfaceStatusChoices,
@@ -32,6 +33,7 @@ from nautobot.dcim.choices import (
     SubdeviceRoleChoices,
 )
 from nautobot.dcim.constants import (
+    COPPER_TWISTED_PAIR_IFACE_TYPES,
     NONCONNECTABLE_IFACE_TYPES,
     REARPORT_POSITIONS_MAX,
     REARPORT_POSITIONS_MIN,
@@ -596,6 +598,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",
@@ -664,6 +746,9 @@ class Interface(ModularComponentModel, CableTermination, PathEndpoint, BaseInter
         blank=True,
         verbose_name="IP Addresses",
     )
+    # Operational attributes (distinct from interface type capabilities)
+    speed = models.PositiveIntegerField(null=True, blank=True)
+    duplex = models.CharField(max_length=10, choices=InterfaceDuplexChoices, blank=True, default="")
 
     class Meta(ModularComponentModel.Meta):
         ordering = ("device", "module__id", CollateAsChar("_name"))  # Module.ordering is complex; don't order by module
@@ -798,72 +883,21 @@ 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.
+        # Speed/Duplex validation
+        self._validate_speed_and_duplex()
 
-        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.
+    def _validate_speed_and_duplex(self):
+        """Validate speed (Kbps) and duplex based on interface type."""
 
-        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)
+        # Check settings by interface type
+        if self.speed and any([self.is_lag, self.is_virtual, self.is_wireless]):
+            raise ValidationError({"speed": "Speed is not applicable to this interface type."})
 
-    add_ip_addresses.alters_data = True
+        if self.duplex and any([self.is_lag, self.is_virtual, self.is_wireless]):
+            raise ValidationError({"duplex": "Duplex is not applicable to this interface type."})
 
-    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
+        if self.duplex and self.type not in COPPER_TWISTED_PAIR_IFACE_TYPES:
+            raise ValidationError({"duplex": "Duplex is only applicable to copper twisted-pair interfaces."})
 
     @property
     def is_connectable(self):
@@ -997,7 +1031,7 @@ class InterfaceRedundancyGroupAssociation(BaseModel, ChangeLoggedModel):
         on_delete=models.CASCADE,
         related_name="interface_redundancy_group_associations",
     )
-    priority = models.PositiveSmallIntegerField()
+    priority = models.PositiveIntegerField()
     is_metadata_associable_model = False
 
     class Meta:

nautobot/dcim/models/devices.py

@@ -25,6 +25,7 @@ from nautobot.dcim.choices import (
     ControllerCapabilitiesChoices,
     DeviceFaceChoices,
     DeviceRedundancyGroupFailoverStrategyChoices,
+    DeviceUniquenessChoices,
     SoftwareImageFileHashingAlgorithmChoices,
     SubdeviceRoleChoices,
 )
@@ -391,6 +392,10 @@ class DeviceType(PrimaryModel):
     def display(self):
         return f"{self.manufacturer.name} {self.model}"
 
+    @property
+    def page_title(self):
+        return str(self)
+
     @property
     def is_parent_device(self):
         return self.subdevice_role == SubdeviceRoleChoices.ROLE_PARENT
@@ -620,7 +625,7 @@ class Device(PrimaryModel, ConfigContextModel):
         null=True,
         verbose_name="Device Redundancy Group",
     )
-    device_redundancy_group_priority = models.PositiveSmallIntegerField(
+    device_redundancy_group_priority = models.PositiveIntegerField(
         blank=True,
         null=True,
         validators=[MinValueValidator(1)],
@@ -682,19 +687,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 +722,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 +905,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
@@ -1953,10 +1954,19 @@ class Module(PrimaryModel):
     def display(self):
         if self.location:
             return f"{self!s} at location {self.location}"
-        elif self.parent_module_bay.parent_device is not None:
+        if self.parent_module_bay.parent_device is not None:
             return f"{self.module_type!s} installed in {self.parent_module_bay.parent_device.display}"
-        else:
-            return f"{self.module_type!s} installed in {self.parent_module_bay.parent_module.display}"
+
+        return f"{self.module_type!s} installed in {self.parent_module_bay.parent_module.display}"
+
+    @property
+    def page_title(self):
+        if self.location:
+            return f"{self.module_type!s} at location {self.location}"
+        if self.parent_module_bay.parent_device is not None:
+            return f"{self.module_type!s} installed in {self.parent_module_bay.parent_device.display}"
+
+        return f"{self.module_type!s} installed in {self.parent_module_bay.parent_module.module_type!s}"
 
     @property
     def device(self):

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

@@ -11,6 +11,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+from nautobot.core.templatetags.helpers import humanize_speed
 from nautobot.dcim.models import (
     ConsolePort,
     ConsoleServerPort,
@@ -295,6 +296,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 +317,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
         model = Module
         fields = (
             "pk",
+            "id",
             "module_type",
             "module_family",
             "parent_module_bay",
@@ -329,6 +332,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
         )
         default_columns = (
             "pk",
+            "id",
             "module_type",
             "module_family",
             "parent_module_bay",
@@ -725,6 +729,8 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi
         url_params={"interfaces": "pk"},
         verbose_name="Virtual Device Contexts",
     )
+    speed = tables.Column(verbose_name="Speed", accessor="speed", orderable=True)
+    duplex = tables.Column(verbose_name="Duplex", accessor="duplex", orderable=True)
 
     class Meta(ModularDeviceComponentTable.Meta):
         model = Interface
@@ -738,6 +744,8 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi
             "label",
             "enabled",
             "type",
+            "speed",
+            "duplex",
             "mgmt_only",
             "mtu",
             "vrf",
@@ -763,9 +771,13 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi
             "label",
             "enabled",
             "type",
+            "speed",
             "description",
         )
 
+    def render_speed(self, record):
+        return humanize_speed(record.speed)
+
 
 class DeviceModuleInterfaceTable(InterfaceTable):
     name = tables.TemplateColumn(
@@ -791,6 +803,8 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "module",
             "enabled",
             "type",
+            "speed",
+            "duplex",
             "parent_interface",
             "bridge",
             "lag",
@@ -836,6 +850,9 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "data-name": lambda record: record.name,
         }
 
+    def render_speed(self, record):
+        return humanize_speed(record.speed)
+
 
 class FrontPortTable(ModularDeviceComponentTable, CableTerminationTable):
     rear_port_position = tables.Column(verbose_name="Position")
@@ -1288,6 +1305,7 @@ class InterfaceRedundancyGroupAssociationTable(BaseTable):
     """Table for list view."""
 
     pk = ToggleColumn()
+    interface__enabled = BooleanColumn()
     interface_redundancy_group = tables.Column(linkify=True, verbose_name="Group Name")
     interface_redundancy_group__virtual_ip = tables.Column(linkify=True, verbose_name="Virtual IP")
     interface_redundancy_group__protocol_group_id = tables.Column(verbose_name="Group ID")

nautobot/dcim/tables/devicetypes.py

@@ -8,6 +8,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+from nautobot.core.templatetags.helpers import humanize_speed
 from nautobot.dcim.models import (
     ConsolePortTemplate,
     ConsoleServerPortTemplate,
@@ -270,6 +271,8 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
 
 class InterfaceTemplateTable(ComponentTemplateTable):
     mgmt_only = BooleanColumn(verbose_name="Management Only")
+    speed = tables.Column(verbose_name="Speed", accessor="speed", orderable=True)
+    duplex = tables.Column(verbose_name="Duplex", accessor="duplex", orderable=True)
     actions = ButtonsColumn(
         model=InterfaceTemplate,
         buttons=("edit", "delete"),
@@ -278,9 +281,13 @@ class InterfaceTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = InterfaceTemplate
-        fields = ("pk", "name", "label", "mgmt_only", "type", "description", "actions")
+        fields = ("pk", "name", "label", "mgmt_only", "type", "speed", "duplex", "description", "actions")
+        default_columns = ("pk", "name", "label", "mgmt_only", "type", "speed", "description", "actions")
         empty_text = "None"
 
+    def render_speed(self, record):
+        return humanize_speed(record.speed)
+
 
 class FrontPortTemplateTable(ComponentTemplateTable):
     rear_port_position = tables.Column(verbose_name="Position")

nautobot/dcim/tables/racks.py

@@ -130,8 +130,6 @@ class RackDetailTable(RackTable):
             "role",
             "u_height",
             "device_count",
-            "get_utilization",
-            "get_power_utilization",
         )
 
 

nautobot/dcim/tables/template_code.py

@@ -102,7 +102,7 @@ TREE_LINK = """
 
 POWERFEED_CABLE = """
 <a href="{{ value.get_absolute_url }}">{{ value }}</a>
-<a href="{% url 'dcim:powerfeed_trace' pk=record.pk %}" class="btn btn-primary btn-xs" title="Trace">
+<a href="{% url 'dcim:powerfeed_trace' pk=record.pk %}" class="btn btn-primary btn-sm" title="Trace">
     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
 </a>
 """
@@ -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>