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

Replace pydot by graphviz

This is in an effort to support Python 3: pydot is not compatible with
Python 3, while graphviz is.
This commit is contained in:
Pit Kleyersburg
2016-06-29 11:25:36 +02:00
parent b02c54ce52
commit 522a0c20e7
2 changed files with 15 additions and 20 deletions

View File

@ -1,4 +1,4 @@
import pydot
import graphviz
from rest_framework import generics
from rest_framework.views import APIView
import tempfile
@ -49,32 +49,30 @@ class TopologyMapView(APIView):
tmap = get_object_or_404(TopologyMap, slug=slug)
# Construct the graph
graph = pydot.Dot(graph_type='graph', ranksep='1')
graph = graphviz.Graph()
graph.graph_attr['ranksep'] = '1'
for i, device_set in enumerate(tmap.device_sets):
subgraph = pydot.Subgraph('sg{}'.format(i), rank='same')
subgraph = graphviz.Graph(name='sg{}'.format(i))
subgraph.graph_attr['rank'] = 'same'
# Add a pseudonode for each device_set to enforce hierarchical layout
subgraph.add_node(pydot.Node('set{}'.format(i), shape='none', width='0', label=''))
subgraph.node('set{}'.format(i), label='', shape='none', width='0')
if i:
graph.add_edge(pydot.Edge('set{}'.format(i - 1), 'set{}'.format(i), style='invis'))
graph.edge('set{}'.format(i - 1), 'set{}'.format(i), style='invis')
# Add each device to the graph
devices = []
for query in device_set.split(','):
devices += Device.objects.filter(name__regex=query)
for d in devices:
node = pydot.Node(d.name)
subgraph.add_node(node)
subgraph.node(d.name)
# Add an invisible connection to each successive device in a set to enforce horizontal order
for j in range(0, len(devices) - 1):
edge = pydot.Edge(devices[j].name, devices[j + 1].name)
# edge.set('style', 'invis') doesn't seem to work for some reason
edge.set_style('invis')
subgraph.add_edge(edge)
subgraph.edge(devices[j].name, devices[j + 1].name, style='invis')
graph.add_subgraph(subgraph)
graph.subgraph(subgraph)
# Compile list of all devices
device_superset = Q()
@ -87,17 +85,14 @@ class TopologyMapView(APIView):
connections = InterfaceConnection.objects.filter(interface_a__device__in=devices,
interface_b__device__in=devices)
for c in connections:
edge = pydot.Edge(c.interface_a.device.name, c.interface_b.device.name)
graph.add_edge(edge)
graph.edge(c.interface_a.device.name, c.interface_b.device.name)
# Write the image to disk and return
topo_file = tempfile.NamedTemporaryFile()
# Get the image data and return
try:
graph.write(topo_file.name, format='png')
topo_data = graph.pipe(format='png')
except:
return HttpResponse("There was an error generating the requested graph. Ensure that the GraphViz "
"executables have been installed correctly.")
response = HttpResponse(FileWrapper(topo_file), content_type='image/png')
topo_file.close()
response = HttpResponse(topo_data, content_type='image/png')
return response

View File

@ -5,6 +5,7 @@ django-filter==0.13.0
django-rest-swagger==0.3.7
django-tables2==1.2.1
djangorestframework==3.3.3
graphviz==0.4.10
Markdown==2.6.6
ncclient==0.4.7
netaddr==0.7.18
@ -12,6 +13,5 @@ paramiko==2.0.0
psycopg2==2.6.1
py-gfm==0.1.3
pycrypto==2.6.1
pydot==1.0.2
sqlparse==0.1.19
xmltodict==0.10.2