Merge pull request #11 from mattieserver/17052020_dev

17052020 dev

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.0'
+    version = '0.4.1'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'topology-views'

netbox_topology_views/api/views.py

@@ -123,8 +123,9 @@ class SearchViewSet(GenericViewSet):
         for device in devices:
             cables = device.get_cables()
             for cable in cables:
+                if cable.termination_a_type.name != "circuit termination" and cable.termination_b_type.name != "circuit termination":
                     if cable.id not in cable_ids:
-                    if cable.termination_a_type.name not in ignore_cable_type:
+                        if cable.termination_a_type.name not in ignore_cable_type and cable.termination_b_type.name not in ignore_cable_type:
                             cable_ids.append(cable.id)
                             edge_ids += 1
                             edge = {}
@@ -133,6 +134,9 @@ class SearchViewSet(GenericViewSet):
                             edge["to"] = cable.termination_b.device.id
                             edge["title"] = "Connection between <br> " + cable.termination_a.device.name + " [" + cable.termination_a.name +  "]<br>" + cable.termination_b.device.name + " [" + cable.termination_b.name + "]"
                             edges.append(edge)
+                else:
+                    pass
+                    #circuittermination not supported for now
             node = {}
             node["id"] = device.id
             node["name"] = device.name

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "netbox_topology_views",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "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.0',
+    version='0.4.1',
     description='An NetBox plugin to create Topology maps',
     url='https://github.com/mattieserver/netbox-topology-views',
     author='Mattijs Vanhaverbeke',