Some fixes

Refactor port class and tooltip title logic

Author: peterbaumert

netbox_device_view/templates/netbox_device_view/ports.html

@@ -28,14 +28,38 @@ <h2 class="card-header">Deviceview {{ object.name }}</h2>
 			{% for int in interfaces %}
 			<a
 				href="{{int.get_absolute_url}}trace/"
-				class="{% if int.enabled and int.connected_endpoints|length > 0 %}bg-success{% elif int.enabled %}bg-secondary{% else %}bg-danger{% endif %}"
-				title="{{ int.name }}{% if int.connected_endpoints|length > 0 %}<hr>{{ int.connected_endpoints.0.device }} | {{ int.connected_endpoints.0.name }}{% endif %}"
-				style="grid-area: {{ int.stylename }}"
+				class="device-view-port 
+				{% if cable_colors == "on" and int.cable.color == "" or cable_colors == "on" and int.cable == None %}
+				nocolor
+				{% elif cable_colors == "on" %}
+				{% elif int.enabled and int.connected_endpoints|length > 0 or int.is_port and int.link_peers|length > 0 %}
+				bg-success
+				{% elif int.enabled %}
+				bg-secondary
+				{% else %}
+				bg-danger
+				{% endif %}"
+				title="{{ int.name }}
+				{% if int.connected_endpoints|length > 0 %}<hr>
+					{% for ce in int.connected_endpoints %}
+					{{ ce.device }} | {{ ce.name }}
+					{% endfor %}
+				{% elif int.link_peers|length > 0 %}<hr>
+					{% for lp in int.link_peers %}
+					{% if lp.device %}
+					{{ lp.device }} | {{ lp.name }}
+					{% elif lp.circuit %}
+					{{ lp }}
+					{% endif %}
+					{% endfor %}
+				{% endif %}
+				"
+				style="grid-area: {{ int.stylename }}{% if cable_colors == 'on' and int.cable.color != '' %}; background-color: #{{ int.cable.color }}{% endif %}"
 				data-bs-toggle="tooltip"
 				data-bs-html="true"
 				data-bs-custom-class="device-view-tooltip"
 			>
-				{% if int.enabled and int.connected_endpoints|length > 0 %}
+				{% if int.enabled and int.connected_endpoints|length > 0  or int.is_port and int.link_peers|length > 0 %}
 				<span class="text-white"><i class="mdi mdi-check-bold"></i></span>
 				{% elif int.enabled %}
 				<span class="text-white"><i class="mdi mdi-check-bold"></i></span>

netbox_device_view/utils.py

@@ -13,12 +13,15 @@ def process_interfaces(interfaces, ports_chassis, dev):
             regex = r"^(?P<type>([a-zA-Z\-_]*))(\/|(?P<dev>[0-9]+).|\s)?((?P<module>[0-9]+).|\s)?((?P<port>[0-9]+))$"
             matches = re.search(regex, itf.name.lower())
             if matches:
-                itf.stylename = (
-                    (matches["type"] or "")
-                    + (matches["module"] or "")
-                    + "-"
-                    + matches["port"]
-                )
+                if not matches["type"] and not matches["type"]:
+                    stylename = matches["port"]
+                else:
+                    stylename = (
+                        (matches["type"] or "")
+                        + (matches["module"] or "")
+                        + "-"
+                        + matches["port"]
+                    )
             else:
                 itf.stylename = re.sub(r"[^.a-zA-Z\d]", "-", itf.name.lower())
             if itf.stylename.isdigit():

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="netbox-device-view",
-    version="0.1.13",
+    version="0.1.14",
     description="NetBox Device View plugin",
     packages=find_packages(),
     author="Peter Baumert",