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

Closes #430: Include circuits when rendering topology maps

Browse Source
This commit is contained in:
Jeremy Stretch 2017-04-05 17:24:40 -04:00
parent d98e9e1838
commit fc46f70153
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/models.py
View File

@ -318,6 +318,7 @@ class TopologyMap(models.Model):
def render(self, img_format='png'): def render(self, img_format='png'):
from circuits.models import CircuitTermination
from dcim.models import Device, InterfaceConnection from dcim.models import Device, InterfaceConnection
# Construct the graph # Construct the graph
@ -352,7 +353,7 @@ class TopologyMap(models.Model):
for query in device_set.split(';'): # Split regexes on semicolons for query in device_set.split(';'): # Split regexes on semicolons
device_superset = device_superset | Q(name__regex=query) device_superset = device_superset | Q(name__regex=query)
# Add all connections to the graph # Add all interface connections to the graph
devices = Device.objects.filter(*(device_superset,)) devices = Device.objects.filter(*(device_superset,))
connections = InterfaceConnection.objects.filter( connections = InterfaceConnection.objects.filter(
interface_a__device__in=devices, interface_b__device__in=devices interface_a__device__in=devices, interface_b__device__in=devices
@ -360,6 +361,12 @@ class TopologyMap(models.Model):
for c in connections: for c in connections:
graph.edge(c.interface_a.device.name, c.interface_b.device.name) graph.edge(c.interface_a.device.name, c.interface_b.device.name)
# Add all circuits to the graph
for termination in CircuitTermination.objects.filter(term_side='A', interface__device__in=devices):
peer_termination = termination.get_peer_termination()
if peer_termination is not None and peer_termination.interface.device in devices:
graph.edge(termination.interface.device.name, peer_termination.interface.device.name, color='blue')
return graph.pipe(format=img_format) return graph.pipe(format=img_format)