From 616c0ab1b57e03b32430b5fa427e36bfad511ff7 Mon Sep 17 00:00:00 2001 From: Mattijs Vanhaverbeke Date: Tue, 22 Feb 2022 16:44:32 +0100 Subject: [PATCH] fixed enable_circuit_terminations --- netbox_topology_views/views.py | 79 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/netbox_topology_views/views.py b/netbox_topology_views/views.py index 8e1941e..fd42198 100644 --- a/netbox_topology_views/views.py +++ b/netbox_topology_views/views.py @@ -56,52 +56,53 @@ def get_topology_data(queryset): edge["color"] = "#" + link_from.color edges.append(edge) else: - if link_from.termination_a.circuit.id not in circuit_ids: - circuit_ids.append(link_from.termination_a.circuit.id) - edge_ids += 1 + if settings.PLUGINS_CONFIG["netbox_topology_views"]["enable_circuit_terminations"]: + if link_from.termination_a.circuit.id not in circuit_ids: + circuit_ids.append(link_from.termination_a.circuit.id) + edge_ids += 1 - cable_b_dev_name = link_from.termination_b.device.name - if cable_b_dev_name is None: - cable_b_dev_name = "device B name unknown" - cable_b_name = link_from.termination_b.name - if cable_b_name is None: - cable_b_name = "cable B name unknown" + cable_b_dev_name = link_from.termination_b.device.name + if cable_b_dev_name is None: + cable_b_dev_name = "device B name unknown" + cable_b_name = link_from.termination_b.name + if cable_b_name is None: + cable_b_name = "cable B name unknown" - edge = {} - edge["id"] = edge_ids - edge["to"] = link_from.termination_b.device.id - edge["dashes"] = True - title = "" + edge = {} + edge["id"] = edge_ids + edge["to"] = link_from.termination_b.device.id + edge["dashes"] = True + title = "" - title += "Circuit provider: " + link_from.termination_a.circuit.provider.name + "
" - title += "Termination between
" - title += cable_b_dev_name + " [" + cable_b_name + "]
" + title += "Circuit provider: " + link_from.termination_a.circuit.provider.name + "
" + title += "Termination between
" + title += cable_b_dev_name + " [" + cable_b_name + "]
" - if link_from.termination_a.circuit.termination_a is not None and link_from.termination_a.circuit.termination_a.cable is not None and link_from.termination_a.circuit.termination_a.cable.id != link_from.id and link_from.termination_a.circuit.termination_a.cable.termination_b is not None and link_from.termination_a.circuit.termination_a.cable.termination_b.device is not None: - edge["from"] = link_from.termination_a.circuit.termination_a.cable.termination_b.device.id + if link_from.termination_a.circuit.termination_a is not None and link_from.termination_a.circuit.termination_a.cable is not None and link_from.termination_a.circuit.termination_a.cable.id != link_from.id and link_from.termination_a.circuit.termination_a.cable.termination_b is not None and link_from.termination_a.circuit.termination_a.cable.termination_b.device is not None: + edge["from"] = link_from.termination_a.circuit.termination_a.cable.termination_b.device.id - cable_a_dev_name = link_from.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 = link_from.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 = link_from.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 = link_from.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) - if link_from.termination_a.circuit.termination_z is not None and link_from.termination_a.circuit.termination_z.cable is not None and link_from.termination_a.circuit.termination_z.cable.id != link_from.id and link_from.termination_a.circuit.termination_z.cable.termination_b is not None and link_from.termination_a.circuit.termination_z.cable.termination_b.device is not None: - edge["from"] = link_from.termination_a.circuit.termination_z.cable.termination_b.device.id + if link_from.termination_a.circuit.termination_z is not None and link_from.termination_a.circuit.termination_z.cable is not None and link_from.termination_a.circuit.termination_z.cable.id != link_from.id and link_from.termination_a.circuit.termination_z.cable.termination_b is not None and link_from.termination_a.circuit.termination_z.cable.termination_b.device is not None: + edge["from"] = link_from.termination_a.circuit.termination_z.cable.termination_b.device.id - cable_a_dev_name = link_from.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 = link_from.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 = link_from.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 = link_from.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) if qs_device.id not in nodes_ids: nodes_ids.append(qs_device.id)