NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 04:42:22 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

TopologyMap: Allow multiple device regexes per line

Browse Source
This commit is contained in:
Jeremy Stretch
2016-04-12 09:31:40 -04:00
parent 29fd04026d
commit fdda706f36
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/api/views.py
View File

@@ -59,7 +59,9 @@ class TopologyMapView(APIView):
graph.add_edge(pydot.Edge('set{}'.format(i - 1), 'set{}'.format(i), style='invis'))
# Add each device to the graph
devices = Device.objects.filter(name__regex=device_set)
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)
@@ -75,8 +77,9 @@ class TopologyMapView(APIView):
# Compile list of all devices
device_superset = Q()
for regex in tmap.device_sets:
device_superset = device_superset | Q(name__regex=regex)
for device_set in tmap.device_sets:
for query in device_set.split(','):
device_superset = device_superset | Q(name__regex=query)
# Add all connections to the graph
devices = Device.objects.filter(*(device_superset,))