From b3b94f63d9c26e6b861a57d2eb45c39057b6b172 Mon Sep 17 00:00:00 2001 From: Roy Vegard Ovesen Date: Sun, 29 Jan 2023 11:52:50 +0000 Subject: [PATCH 1/2] Add a url to cable trace for logical connections Fixes #254 --- netbox_topology_views/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/netbox_topology_views/views.py b/netbox_topology_views/views.py index 282cd61..75293a2 100644 --- a/netbox_topology_views/views.py +++ b/netbox_topology_views/views.py @@ -178,7 +178,7 @@ def create_edge( cable: Optional[Cable] = None, wireless: Optional[Dict] = None, power: Optional[bool] = None, - interface: Optional[bool] = None, + interface: Optional[Interface] = None, ): cable_a_name = ( "device A name unknown" @@ -225,6 +225,7 @@ def create_edge( edge["dashes"] = [1, 10, 1, 10] edge["arrows"] = {"to": {"enabled": True, "scaleFactor": 0.5}, "from": {"enabled": True, "scaleFactor": 0.5}} edge["color"] = '#f1c232' + edge["href"] = interface.get_absolute_url() + "/trace" edge[ "title" @@ -445,7 +446,7 @@ def get_topology_data( edge_ids += 1 termination_a = { "termination_name": interface.name, "termination_device_name": interface.device.name, "device_id": interface.device.id } termination_b = { "termination_name": destination.name, "termination_device_name": destination.device.name, "device_id": destination.device.id } - edges.append(create_edge(edge_id=edge_ids, termination_a=termination_a, termination_b=termination_b, interface=True)) + edges.append(create_edge(edge_id=edge_ids, termination_a=termination_a, termination_b=termination_b, interface=interface)) nodes_devices[interface.device.id] = interface.device nodes_devices[destination.device.id] = destination.device From 7ecd29bb5d754401e8d726fad21c4ec6176a5fa5 Mon Sep 17 00:00:00 2001 From: Roy Vegard Ovesen Date: Sun, 29 Jan 2023 18:57:09 +0100 Subject: [PATCH 2/2] Avoid rendering double slash Co-authored-by: Mario --- netbox_topology_views/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_topology_views/views.py b/netbox_topology_views/views.py index 75293a2..4b0faa3 100644 --- a/netbox_topology_views/views.py +++ b/netbox_topology_views/views.py @@ -225,7 +225,7 @@ def create_edge( edge["dashes"] = [1, 10, 1, 10] edge["arrows"] = {"to": {"enabled": True, "scaleFactor": 0.5}, "from": {"enabled": True, "scaleFactor": 0.5}} edge["color"] = '#f1c232' - edge["href"] = interface.get_absolute_url() + "/trace" + edge["href"] = interface.get_absolute_url() + "trace" edge[ "title"