NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 02:06:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Extend cable tracing to support terminations to different parent objects

Browse Source
This commit is contained in:
jeremystretch 2022-06-27 15:22:09 -04:00
parent fcd1daaf79
commit 7622d90c1d
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,9 +444,8 @@ class CablePath(models.Model):
while terminations: while terminations:
# Terminations must all be of the same type and belong to the same parent # Terminations must all be of the same type
assert all(isinstance(t, type(terminations[0])) for t in terminations[1:]) assert all(isinstance(t, type(terminations[0])) for t in terminations[1:])
assert all(t.parent_object == terminations[0].parent_object for t in terminations[1:])
# Step 1: Record the near-end termination object(s) # Step 1: Record the near-end termination object(s)
path.append([ path.append([

45
netbox/dcim/svg/cables.py
View File

@ -18,7 +18,6 @@ PADDING = 10
LINE_HEIGHT = 20 LINE_HEIGHT = 20
FANOUT_HEIGHT = 35 FANOUT_HEIGHT = 35
FANOUT_LEG_HEIGHT = 15 FANOUT_LEG_HEIGHT = 15
TERMINATION_WIDTH = 100
class Node(Hyperlink): class Node(Hyperlink):
@ -174,32 +173,35 @@ class CableTraceSVG:
# Other parent object # Other parent object
return 'e0e0e0' return 'e0e0e0'
def draw_parent_object(self, obj): def draw_parent_objects(self, obj_list):
node = Node( """
position=(0, self.cursor), Draw a set of parent objects.
width=self.width, """
url=f'{self.base_url}{obj.get_absolute_url()}', width = self.width / len(obj_list)
color=self._get_color(obj), for i, obj in enumerate(obj_list):
labels=self._get_labels(obj) node = Node(
) position=(i * width, self.cursor),
self.parent_objects.append(node) width=width,
self.cursor += node.box['height'] url=f'{self.base_url}{obj.get_absolute_url()}',
color=self._get_color(obj),
return node labels=self._get_labels(obj)
)
self.parent_objects.append(node)
if i + 1 == len(obj_list):
self.cursor += node.box['height']
def draw_terminations(self, terminations): def draw_terminations(self, terminations):
""" """
Draw a row of terminating objects (e.g. interfaces) belonging to the same parent object, all of which Draw a row of terminating objects (e.g. interfaces), all of which are attached to the same end of a cable.
are attached to the same end of a cable.
""" """
nodes = [] nodes = []
nodes_height = 0 nodes_height = 0
x = self.width / 2 - len(terminations) * TERMINATION_WIDTH / 2 width = self.width / len(terminations)
for i, term in enumerate(terminations): for i, term in enumerate(terminations):
node = Node( node = Node(
position=(x + i * TERMINATION_WIDTH, self.cursor), position=(i * width, self.cursor),
width=TERMINATION_WIDTH, width=width,
url=f'{self.base_url}{term.get_absolute_url()}', url=f'{self.base_url}{term.get_absolute_url()}',
color=self._get_color(term), color=self._get_color(term),
labels=self._get_labels(term), labels=self._get_labels(term),
@ -324,7 +326,7 @@ class CableTraceSVG:
# Near end parent # Near end parent
if i == 0: if i == 0:
# If this is the first segment, draw the originating termination's parent object # If this is the first segment, draw the originating termination's parent object
self.draw_parent_object(near_ends[0].parent_object) self.draw_parent_objects(set(end.parent_object for end in near_ends))
# Near end termination(s) # Near end termination(s)
terminations = self.draw_terminations(near_ends) terminations = self.draw_terminations(near_ends)
@ -363,7 +365,8 @@ class CableTraceSVG:
self.draw_terminations(far_ends) self.draw_terminations(far_ends)
# Far end parent # Far end parent
self.draw_parent_object(far_ends[0].parent_object) parent_objects = set(end.parent_object for end in far_ends)
self.draw_parent_objects(parent_objects)
elif far_ends: elif far_ends:
@ -372,7 +375,7 @@ class CableTraceSVG:
self.connectors.append(attachment) self.connectors.append(attachment)
# ProviderNetwork # ProviderNetwork
self.draw_parent_object(far_ends[0]) self.draw_parent_objects(set(end.parent_object for end in far_ends))
# Determine drawing size # Determine drawing size
self.drawing = svgwrite.Drawing( self.drawing = svgwrite.Drawing(