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

Ignore the position stack when traversing single-position rear ports

Browse Source
This commit is contained in:
Jeremy Stretch
2020-09-30 17:09:39 -04:00
parent 319329e2b2
commit cd71799373
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/dcim/utils.py
View File

@ -34,14 +34,18 @@ def trace_paths(node):
# Follow a FrontPort to its corresponding RearPort # Follow a FrontPort to its corresponding RearPort
if isinstance(peer_termination, FrontPort): if isinstance(peer_termination, FrontPort):
path.append(object_to_path_node(peer_termination)) path.append(object_to_path_node(peer_termination))
position_stack.append(peer_termination.rear_port_position)
node = peer_termination.rear_port node = peer_termination.rear_port
if node.positions > 1:
position_stack.append(peer_termination.rear_port_position)
path.append(object_to_path_node(node)) path.append(object_to_path_node(node))
# Follow a RearPort to its corresponding FrontPort # Follow a RearPort to its corresponding FrontPort
elif isinstance(peer_termination, RearPort): elif isinstance(peer_termination, RearPort):
path.append(object_to_path_node(peer_termination)) path.append(object_to_path_node(peer_termination))
if position_stack: if peer_termination.positions == 1:
node = FrontPort.objects.get(rear_port=peer_termination, rear_port_position=1)
path.append(object_to_path_node(node))
elif position_stack:
position = position_stack.pop() position = position_stack.pop()
node = FrontPort.objects.get(rear_port=peer_termination, rear_port_position=position) node = FrontPort.objects.get(rear_port=peer_termination, rear_port_position=position)
path.append(object_to_path_node(node)) path.append(object_to_path_node(node))