NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 08:25:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor tweaks based on Arthur's feedback

Browse Source
This commit is contained in:
Daniel Sheppard 2023-09-01 00:27:27 -05:00
parent b2c35e0693
commit 880e79a1b5
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,10 +537,10 @@ class CablePath(models.Model):
# Step 2: Determine the attached links (Cable or WirelessLink), if any # Step 2: Determine the attached links (Cable or WirelessLink), if any
links = [termination.link for termination in terminations if termination.link is not None] links = [termination.link for termination in terminations if termination.link is not None]
if len(links) == 0 and len(path) == 1: if len(links) == 0:
if len(path) == 1:
# If this is the start of the path and no link exists, return None # If this is the start of the path and no link exists, return None
return None return None
elif len(links) == 0:
# Otherwise, halt the trace if no link exists # Otherwise, halt the trace if no link exists
break break
assert all(type(link) in (Cable, WirelessLink) for link in links) assert all(type(link) in (Cable, WirelessLink) for link in links)
@ -559,7 +559,7 @@ class CablePath(models.Model):
link.status for link in links if hasattr(link, 'status') and link.status for link in links if hasattr(link, 'status') and
link.status != LinkStatusChoices.STATUS_CONNECTED link.status != LinkStatusChoices.STATUS_CONNECTED
] ]
if len(links_status) > 0 and len(links) != len(links_status): if len(links_status) and len(links) != len(links_status):
is_active = False is_active = False
# Step 5: Determine the far-end terminations # Step 5: Determine the far-end terminations
@ -614,15 +614,21 @@ class CablePath(models.Model):
rear_port_id__in=[rp.pk for rp in remote_terminations], rear_port_id__in=[rp.pk for rp in remote_terminations],
rear_port_position=1 rear_port_position=1
) )
# Obtain the individual front ports based on the termination and all positions
elif len(remote_terminations) > 1 and position_stack: elif len(remote_terminations) > 1 and position_stack:
positions = position_stack.pop() positions = position_stack.pop()
# Ensure we have a number of positions equal to the amount of remote terminations
assert len(remote_terminations) == len(positions) assert len(remote_terminations) == len(positions)
# Get our front ports
q_filter = Q() q_filter = Q()
for rt in remote_terminations: for rt in remote_terminations:
position = positions.pop() position = positions.pop()
q_filter |= Q(rear_port_id=rt.pk, rear_port_position=position) q_filter |= Q(rear_port_id=rt.pk, rear_port_position=position)
assert q_filter is not Q() assert q_filter is not Q()
front_ports = FrontPort.objects.filter(q_filter) front_ports = FrontPort.objects.filter(q_filter)
# Obtain the individual front ports based on the termination and position
elif position_stack: elif position_stack:
front_ports = FrontPort.objects.filter( front_ports = FrontPort.objects.filter(
rear_port_id=remote_terminations[0].pk, rear_port_id=remote_terminations[0].pk,
@ -674,15 +680,13 @@ class CablePath(models.Model):
is_split = True is_split = True
break break
cablepath = cls( return cls(
path=path, path=path,
is_complete=is_complete, is_complete=is_complete,
is_active=is_active, is_active=is_active,
is_split=is_split is_split=is_split
) )
return cablepath
def retrace(self): def retrace(self):
""" """
Retrace the path from the currently-defined originating termination(s) Retrace the path from the currently-defined originating termination(s)