small cleanup and v0.4.5

Shorter Label and more details for device

netbox_topology_views/__init__.py

@@ -4,7 +4,7 @@ class TopologyViewsConfig(PluginConfig):
     name = 'netbox_topology_views'
     verbose_name = 'Topology views'
     description = 'An plugin to render toplogoy maps'
-    version = '0.4.3'
+    version = '0.4.5'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'topology-views'

netbox_topology_views/api/views.py

@@ -131,16 +131,16 @@ class SearchViewSet(GenericViewSet):
 
                             cable_a_dev_name = cable.termination_a.device.name
                             if cable_a_dev_name is None:
-                                cable_a_dev_name = "device A name unkown"
+                                cable_a_dev_name = "device A name unknown"
                             cable_a_name = cable.termination_a.name
                             if cable_a_name is None:
-                                cable_a_name = "cable A name unkown"
+                                cable_a_name = "cable A name unknown"
                             cable_b_dev_name = cable.termination_b.device.name
                             if cable_b_dev_name is None:
-                                cable_b_dev_name = "device B name unkown"
+                                cable_b_dev_name = "device B name unknown"
                             cable_b_name = cable.termination_b.name
                             if cable_b_name is None:
-                                cable_b_name = "cable B name unkown"
+                                cable_b_name = "cable B name unknown"
 
                             edge = {}
                             edge["id"] = edge_ids
@@ -154,16 +154,26 @@ class SearchViewSet(GenericViewSet):
             
             dev_name = device.name
             if dev_name is None:
-                dev_name = "device name unkown"
+                dev_name = "device name unknown"
 
-            cable_role_name = device.device_type.display_name
-            if cable_role_name is None:
-                cable_role_name = "device role name unkown"
+            node_content = ""
+
+            if device.device_type.display_name is not None:
+                node_content += "<tr><th>Type: </th><td>" + device.device_type.display_name + "</td></tr>"
+            if device.device_role.name is not None:
+                node_content +=  "<tr><th>Role: </th><td>" + device.device_role.name + "</td></tr>"
+            if device.serial != "":
+                node_content += "<tr><th>Serial: </th><td>" + device.serial + "</td></tr>"
+            if device.primary_ip is not None:
+                node_content += "<tr><th>IP Address: </th><td>" + str(device.primary_ip.address) + "</td></tr>"
+
+            dev_title = "<table> %s </table>" % (node_content)
 
             node = {}
             node["id"] = device.id
             node["name"] = dev_name
-            node["label"] = dev_name + " {" + cable_role_name + "}"
+            node["label"] = dev_name
+            node["title"] = dev_title
             node["shape"] = 'image'
             if device.device_role.slug in settings.PLUGINS_CONFIG["netbox_topology_views"]["device_img"]:
                 node["image"] = '../../static/netbox_topology_views/img/'  + device.device_role.slug + ".png"

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "scripts": {
     "resources": "gulp build",
     "resources_dev": "gulp build_dev"

setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='netbox-topology-views',
-    version='0.4.3',
+    version='0.4.5',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',