added draw_default_layout

README.md

@@ -35,6 +35,7 @@ Then run `python3 manage.py collectstatic --no-input`
 
 | netbox version        | netbox-topology-views version          |
 | ------------- |-------------|
+| >= 3.1.8 | >= v1.0.0a1 |
 | >= 2.11.1 | >= v0.5.3 |
 | >= 2.10.0 | >= v0.5.0 |
 | < 2.10.0 | =< v0.4.10 |
@@ -55,20 +56,21 @@ Example:
 ```
 PLUGINS_CONFIG = {
     'netbox_topology_views': {
-        'device_img': 'router,switch,firewall',
-        'preselected_device_roles': 'Router, Firewall'
+        'device_img': ['router','switch', 'firewall'],
+        'preselected_device_roles': ['Router', 'Firewall']
     }
 }
 ```
 
 | Setting        | Default value           | Description  |
 | ------------- |-------------| -----|
-| device_img      | 'access-switch,core-switch,firewall,router,distribution-switch,backup,storage,wan-network,wireless-ap,server,internal-switch,isp-cpe-material,non-racked-devices,power-units' | The slug of the device roles that you have a image for. |
-| preselected_device_roles      | 'Firewall,Router,Distribution Switch,Core Switch,Internal Switch,Access Switch,Server,Storage,Backup,Wireless AP' | The full name of the device roles you want to pre select in the global view.  Note that this is case sensitive|
+| device_img      |['access-switch', 'core-switch', 'firewall', 'router', 'distribution-switch', 'backup', 'storage,wan-network', 'wireless-ap', 'server', 'internal-switch', 'isp-cpe-material', 'non-racked-devices', 'power-units'] | The slug of the device roles that you have a image for. |
+| preselected_device_roles      | ['Firewall', 'Router', 'Distribution Switch', 'Core Switch', 'Internal Switch', 'Access Switch', 'Server', 'Storage', 'Backup', 'Wireless AP'] | The full name of the device roles you want to pre select in the global view.  Note that this is case sensitive|
 | allow_coordinates_saving      | False | (bool) Set to true if you use the custom coordinates fields and want to save the coordinates |
-| ignore_cable_type      | 'power outlet,power port' | The cable types that you want to ignore in the views  |
-| preselected_tags      | '' | The name of tags you want to preload  |
+| ignore_cable_type      | ['power outlet', 'power port'] | The cable types that you want to ignore in the views  |
+| preselected_tags      | '[]' | The name of tags you want to preload  |
 | enable_circuit_terminations      | False  | (bool) Set to true if you want to see circuit terminations in the topology  |
+| draw_default_layout | False | (bool) Set to True if you want to load draw the topology on the initial load (when you go to the topology plugin page) |
 
 ### Custom Images
 

netbox_topology_views/__init__.py

@@ -4,18 +4,19 @@ class TopologyViewsConfig(PluginConfig):
     name = 'netbox_topology_views'
     verbose_name = 'Topology views'
     description = 'An plugin to render topology maps'
-    version = '1.0.0-alpha.1'
+    version = '1.0.0-alpha.2'
     author = 'Mattijs Vanhaverbeke'
     author_email = 'author@example.com'
     base_url = 'netbox_topology_views'
     required_settings = []
     default_settings = {
-        'preselected_device_roles': 'Firewall,Router,Distribution Switch,Core Switch,Internal Switch,Access Switch,Server,Storage,Backup,Wireless AP',
-        'ignore_cable_type': 'power outlet,power port',
-        'device_img': 'access-switch,core-switch,firewall,router,distribution-switch,backup,storage,wan-network,wireless-ap,server,internal-switch,isp-cpe-material,non-racked-devices,power-units',
+        'preselected_device_roles': ['Firewall', 'Router', 'Distribution Switch', 'Core Switch', 'Internal Switch', 'Access Switch', 'Server', 'Storage', 'Backup', 'Wireless AP'],
+        'ignore_cable_type': ['power outlet','power port'],
+        'device_img': ['access-switch', 'core-switch', 'firewall', 'router', 'distribution-switch', 'backup', 'storage,wan-network', 'wireless-ap', 'server', 'internal-switch', 'isp-cpe-material', 'non-racked-devices', 'power-units'],
         'allow_coordinates_saving': False,
-        'preselected_tags' : '',
-        'enable_circuit_terminations': False
+        'preselected_tags' : [],
+        'enable_circuit_terminations': False,
+        'draw_default_layout': False
     }
 
 config = TopologyViewsConfig

netbox_topology_views/filters.py

@@ -11,7 +11,7 @@ class DeviceFilterSet(django_filters.FilterSet):
     )
     tag = TagFilter()
 
-    role_id = django_filters.ModelMultipleChoiceFilter(
+    device_role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role_id',
         queryset=DeviceRole.objects.all(),
         label='Role (ID)',

netbox_topology_views/forms.py

@@ -46,4 +46,3 @@ class DeviceFilterForm(CustomFieldModelFilterForm):
     )
 
     tag = TagFilterField(model)
-

netbox_topology_views/static_dev/css/app.scss

@@ -1,3 +1,4 @@
 #visgraph {
     height: 70vh;
   }
+

netbox_topology_views/views.py

@@ -3,12 +3,17 @@ from django.db.models import Q
 from django.views.generic import View
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.conf import settings
+from django.http import QueryDict
+from django.http import HttpResponseRedirect
 
 from .forms import DeviceFilterForm
 from .filters import DeviceFilterSet
+
 import json
+import distutils
 
 from dcim.models import Device, Cable, DeviceRole, DeviceType
+from extras.models import Tag
 
 def get_topology_data(queryset):
     nodes = []
@@ -133,7 +138,6 @@ def get_topology_data(queryset):
                     node["color.border"] = "#" + qs_device.device_role.color
 
                 if "coordinates" in qs_device.custom_field_data:
-                    print(qs_device.custom_field_data)
                     if qs_device.custom_field_data["coordinates"] is not None:
                         cords =  qs_device.custom_field_data["coordinates"].split(";")
                         node["x"] = int(cords[0])
@@ -158,8 +162,27 @@ class TopologyHomeView(PermissionRequiredMixin, View):
         self.queryset = Device.objects.all()
         self.queryset = self.filterset(request.GET, self.queryset).qs
         topo_data = None
+
         if request.GET:
-            topo_data = get_topology_data(self.queryset)
+            if 'draw_init' in request.GET:
+                if bool(distutils.util.strtobool(request.GET["draw_init"])):
+                    topo_data = get_topology_data(self.queryset)
+            else:
+                topo_data = get_topology_data(self.queryset)
+        else:
+            preselected_device_roles = settings.PLUGINS_CONFIG["netbox_topology_views"]["preselected_device_roles"]
+            preselected_tags = settings.PLUGINS_CONFIG["netbox_topology_views"]["preselected_tags"]
+
+            q_device_role_id = DeviceRole.objects.filter(name__in=preselected_device_roles).values_list('id', flat=True)
+            q_tags = Tag.objects.filter(name__in=preselected_tags).values_list('name', flat=True)
+
+            q = QueryDict(mutable=True)
+            q.setlist('device_role_id', list(q_device_role_id))
+            q.setlist('tag', list(q_tags))
+            q['draw_init'] = settings.PLUGINS_CONFIG["netbox_topology_views"]["draw_default_layout"]
+            query_string = q.urlencode()
+            print(query_string)
+            return HttpResponseRedirect(request.path + "?" + query_string)
 
         return render(request, 'netbox_topology_views/index.html' , {
              'filter_form': DeviceFilterForm(request.GET, label_suffix=''),

package.json

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