mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #9778: Fix exception during cable deletion after deleting a connected termination

Browse Source
This commit is contained in:
jeremystretch
2022-08-03 12:46:16 -04:00
parent b9678c7c0e
commit 367bf25618
6 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
netbox/dcim/models/cables.py
View File

@@ -431,11 +431,7 @@ class CablePath(models.Model):
"""
Return the list of originating objects.
"""
if hasattr(self, '_path_objects'):
return self.path_objects[0]
return [
path_node_to_object(node) for node in self.path[0]
]
return self.path_objects[0]
@property
def destinations(self):
@@ -444,11 +440,7 @@ class CablePath(models.Model):
"""
if not self.is_complete:
return []
if hasattr(self, '_path_objects'):
return self.path_objects[-1]
return [
path_node_to_object(node) for node in self.path[-1]
]
return self.path_objects[-1]
@property
def segment_count(self):
@@ -463,6 +455,9 @@ class CablePath(models.Model):
"""
from circuits.models import CircuitTermination
if not terminations:
return None
# Ensure all originating terminations are attached to the same link
if len(terminations) > 1:
assert all(t.link == terminations[0].link for t in terminations[1:])
@@ -529,6 +524,9 @@ class CablePath(models.Model):
])
# Step 6: Determine the "next hop" terminations, if applicable
if not remote_terminations:
break
if isinstance(remote_terminations[0], FrontPort):
# Follow FrontPorts to their corresponding RearPorts
rear_ports = RearPort.objects.filter(
@@ -640,7 +638,11 @@ class CablePath(models.Model):
nodes = []
for node in step:
ct_id, object_id = decompile_path_node(node)
nodes.append(prefetched[ct_id][object_id])
try:
nodes.append(prefetched[ct_id][object_id])
except KeyError:
# Ignore stale (deleted) object IDs
pass
path.append(nodes)
return path