diff --git a/netbox_topology_views/api/views.py b/netbox_topology_views/api/views.py index 68fb5e1..76295f7 100644 --- a/netbox_topology_views/api/views.py +++ b/netbox_topology_views/api/views.py @@ -175,37 +175,40 @@ class SearchViewSet(GenericViewSet): title += "Circuit provider: " + cable.termination_a.circuit.provider.name + "
" title += "Termination between
" title += cable_b_dev_name + " [" + cable_b_name + "]
" + # To Many if's 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.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 + if cable.termination_a.circuit.termination_a.cable.termination_b.device is not None: + 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 - if cable_a_dev_name is None: - cable_a_dev_name = "device B name unknown" - cable_b_name = cable.termination_a.circuit.termination_a.cable.termination_b.name - if cable_a_name is None: - cable_a_name = "cable B name unknown" - title += cable_a_dev_name + " [" + cable_a_name + "]
" - edge["title"] = title - edges.append(edge) + cable_a_dev_name = cable.termination_a.circuit.termination_a.cable.termination_b.device.name + if cable_a_dev_name is None: + cable_a_dev_name = "device B name unknown" + cable_b_name = cable.termination_a.circuit.termination_a.cable.termination_b.name + if cable_a_name is None: + cable_a_name = "cable B name unknown" + title += cable_a_dev_name + " [" + cable_a_name + "]
" + edge["title"] = title + edges.append(edge) + # To Many if's 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.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 + if cable.termination_a.circuit.termination_z.cable.termination_b.device is not None: + 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 - if cable_a_dev_name is None: - cable_a_dev_name = "device B name unknown" - cable_a_name = cable.termination_a.circuit.termination_z.cable.termination_b.name - if cable_a_name is None: - cable_a_name = "cable B name unknown" - title += cable_a_dev_name + " [" + cable_a_name + "]
" - edge["title"] = title - edges.append(edge) - + cable_a_dev_name = cable.termination_a.circuit.termination_z.cable.termination_b.device.name + if cable_a_dev_name is None: + cable_a_dev_name = "device B name unknown" + cable_a_name = cable.termination_a.circuit.termination_z.cable.termination_b.name + if cable_a_name is None: + cable_a_name = "cable B name unknown" + title += cable_a_dev_name + " [" + cable_a_name + "]
" + edge["title"] = title + edges.append(edge) dev_name = device.name if dev_name is None: dev_name = "device name unknown"