netbox v2.10 (#52)

* small changes

* removed print

* fix coords

* fix saving coords

* update readme

* fixed icons

* bump version

Co-authored-by: mattieserver <mattijs@DESKTOP-618OSU1.localdomain>

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

netbox_topology_views/api/__init__.py

@@ -0,0 +1 @@
+"""REST API"""

netbox_topology_views/api/urls.py

@@ -1,11 +1,13 @@
-from rest_framework import routers
+from netbox.api import OrderedDefaultRouter
+from . import views
 
-from .views import PreSelectDeviceRolesViewSet, SearchViewSet, SaveCoordsViewSet, PreSelectTagsViewSet
+router = OrderedDefaultRouter()
+router.APIRootView = views.TopologyViewsRootView
 
-router = routers.DefaultRouter()
-router.register('preselectdeviceroles', PreSelectDeviceRolesViewSet)
-router.register('preselecttags', PreSelectTagsViewSet)
-router.register('search', SearchViewSet, basename='search')
-router.register('save-coords', SaveCoordsViewSet, basename='save_coords')
+
+router.register('preselectdeviceroles', views.PreSelectDeviceRolesViewSet)
+router.register('preselecttags', views.PreSelectTagsViewSet)
+router.register('search', views.SearchViewSet, basename='search')
+router.register('save-coords', views.SaveCoordsViewSet, basename='save_coords')
 
 urlpatterns = router.urls

netbox_topology_views/api/views.py

@@ -2,15 +2,15 @@ from rest_framework.viewsets import ModelViewSet, ViewSet, ReadOnlyModelViewSet,
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.contrib.contenttypes.models import ContentType
+from rest_framework.routers import APIRootView
 
 from .serializers import PreDeviceRoleSerializer, TopologyDummySerializer, PreTagSerializer
 from django.conf import settings
 
-from utilities.api import IsAuthenticatedOrLoginNotRequired
-
 from dcim.models import  DeviceRole, Device, Cable
 from circuits.models import Circuit
-from extras.models import Tag, CustomField, CustomFieldValue
+from extras.models import Tag
+
 
 ignore_cable_type_raw = settings.PLUGINS_CONFIG["netbox_topology_views"]["ignore_cable_type"]
 ignore_cable_type = ignore_cable_type_raw.split(",")
@@ -21,6 +21,9 @@ preselected_device_roles = preselected_device_roles_raw.split(",")
 preselected_tags_raw = settings.PLUGINS_CONFIG["netbox_topology_views"]["preselected_tags"]
 preselected_tags = preselected_tags_raw.split(",")
 
+class TopologyViewsRootView(APIRootView):
+    def get_view_name(self):
+        return 'TopologyViews'
 
 class PreSelectDeviceRolesViewSet(ReadOnlyModelViewSet):
     queryset = DeviceRole.objects.filter(name__in=preselected_device_roles)
@@ -38,14 +41,6 @@ class SaveCoordsViewSet(ReadOnlyModelViewSet):
     def save_coords(self, request):
         results = {}
         if settings.PLUGINS_CONFIG["netbox_topology_views"]["allow_coordinates_saving"]:
-            try:
-                 cfCoords = CustomField.objects.get(name='coordinates')
-            except CustomField.DoesNotExist:
-                results["status"] = "coords custom field not created"
-                return Response(status=500)
-
-            obj_type = ContentType.objects.get_for_model(Device)
-
             device_id = None
             x_coord = None
             y_coord = None
@@ -60,26 +55,26 @@ class SaveCoordsViewSet(ReadOnlyModelViewSet):
                     y_coord = request.data["y"]
 
             actual_device= Device.objects.get(id=device_id)
-            try:
-                cfvCoords = CustomFieldValue.objects.get(obj_type=obj_type, obj_id=actual_device.pk, field__name='coordinates')
-                cfvCoords.value = "%s;%s" % (x_coord,y_coord)
-                cfvCoords.save()
-                results["status"] = "coords set"
-            except CustomFieldValue.DoesNotExist:
-                cfvCoords = CustomFieldValue(field=cfCoords, obj_type=obj_type, obj_id=actual_device.id)
-                cfvCoords.value = "%s;%s" % (x_coord,y_coord)
-                cfvCoords.save()
-                results["status"] = "coords set for first time"
-            
+
+            if "coordinates" in actual_device.custom_field_data:
+                actual_device.custom_field_data["coordinates"] = "%s;%s" % (x_coord,y_coord)
+                actual_device.save()
+                results["status"] = "saved coords"
+            else:
+                try:
+                    actual_device.custom_field_data["coordinates"] = "%s;%s" % (x_coord,y_coord)
+                    actual_device.save()
+                    results["status"] = "saved coords"
+                except :
+                    results["status"] = "coords custom field not created"
+                    return Response(status=500)
+
             return Response(results)
         else:
             results["status"] = "not allowed to save coords"
             return Response(results, status=500)
 
 class SearchViewSet(ReadOnlyModelViewSet):
-    #_ignore_model_permissions = True
-    #permission_classes = [IsAuthenticatedOrLoginNotRequired]
-
     queryset = Device.objects.all()
     serializer_class = TopologyDummySerializer
 
@@ -245,9 +240,9 @@ class SearchViewSet(ReadOnlyModelViewSet):
             if device.device_role.color != "":
                 node["color.border"] = "#" + device.device_role.color
 
-            for device_custom_field in device.custom_field_values.all():
-                if device_custom_field.field.name == "coordinates":
-                    cords =  device_custom_field.serialized_value.split(";")
+            if "coordinates" in device.custom_field_data:
+                if device.custom_field_data["coordinates"] != "":
+                    cords =  device.custom_field_data["coordinates"].split(";")
                     node["x"] = int(cords[0])
                     node["y"] = int(cords[1])
                     node["physics"] = False
@@ -259,3 +254,4 @@ class SearchViewSet(ReadOnlyModelViewSet):
         results["edges"] = edges
 
         return Response(results)
+ 

netbox_topology_views/templates/netbox_topology_views/index.html

@@ -14,10 +14,10 @@
 				<strong>Network</strong>  <span id="status"></span>
 				<div class="buttons pull-right">
 					<a id="btnDownloadImage" class="btn btn-xs btn-info">
-						<i class="fa fa-download"></i>
+						<i class="mdi mdi-download"></i>
 					</a>
 					<a id="btnFullView" class="btn btn-xs btn-info disabled" target="_blank">
-						<i class="fa fa-share"></i>
+						<i class="mdi mdi-share"></i>
 					</a>
 				</div>
 			</div>