MrBlake/mrb-netbox-topology-views
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#23 check for nonetype in cable.termination

Browse Source
This commit is contained in:
Mattijs Vanhaverbeke
2020-05-19 22:17:13 +02:00
parent f184bdf2f3
commit 204098a143
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox_topology_views/api/views.py
+4 -1
View File
@@ -178,6 +178,7 @@ class SearchViewSet(GenericViewSet):
if cable.termination_a.circuit.termination_a is not None: if cable.termination_a.circuit.termination_a is not None:
if cable.termination_a.circuit.termination_a.cable is not None: if cable.termination_a.circuit.termination_a.cable is not None:
if cable.termination_a.circuit.termination_a.cable.id != cable.id: if cable.termination_a.circuit.termination_a.cable.id != cable.id:
if cable.termination_a.circuit.termination_a.cable.termination_b is not None:
edge["from"] = cable.termination_a.circuit.termination_a.cable.termination_b.device.id edge["from"] = cable.termination_a.circuit.termination_a.cable.termination_b.device.id
cable_a_dev_name = cable.termination_a.circuit.termination_a.cable.termination_b.device.name cable_a_dev_name = cable.termination_a.circuit.termination_a.cable.termination_b.device.name
@@ -187,9 +188,12 @@ class SearchViewSet(GenericViewSet):
if cable_a_name is None: if cable_a_name is None:
cable_a_name = "cable B name unknown" cable_a_name = "cable B name unknown"
title += cable_a_dev_name + " [" + cable_a_name + "]<br>" title += cable_a_dev_name + " [" + cable_a_name + "]<br>"
edge["title"] = title
edges.append(edge)
if cable.termination_a.circuit.termination_z is not None: if cable.termination_a.circuit.termination_z is not None:
if cable.termination_a.circuit.termination_z.cable is not None: if cable.termination_a.circuit.termination_z.cable is not None:
if cable.termination_a.circuit.termination_z.cable.id != cable.id: if cable.termination_a.circuit.termination_z.cable.id != cable.id:
if cable.termination_a.circuit.termination_z.cable.termination_b is not None:
edge["from"] = cable.termination_a.circuit.termination_z.cable.termination_b.device.id edge["from"] = cable.termination_a.circuit.termination_z.cable.termination_b.device.id
cable_a_dev_name = cable.termination_a.circuit.termination_z.cable.termination_b.device.name cable_a_dev_name = cable.termination_a.circuit.termination_z.cable.termination_b.device.name
@@ -199,7 +203,6 @@ class SearchViewSet(GenericViewSet):
if cable_a_name is None: if cable_a_name is None:
cable_a_name = "cable B name unknown" cable_a_name = "cable B name unknown"
title += cable_a_dev_name + " [" + cable_a_name + "]<br>" title += cable_a_dev_name + " [" + cable_a_name + "]<br>"
edge["title"] = title edge["title"] = title
edges.append(edge) edges.append(edge)