Merge pull request #60 from netbox-community/0.5.0

Reinstate image upload

Author: cruse1977

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 140
+ignore = E126, E722

README.md

@@ -42,6 +42,7 @@ Enable Migrations:
 cd /opt/netbox
 sudo ./venv/bin/python3 netbox/manage.py makemigrations netbox_floorplan_plugin
 sudo ./venv/bin/python3 netbox/manage.py migrate
+sudo ./venv/bin/python3 netbox/manage.py collectstatic
 ```
 
 Restart NetBox and add `netbox-floorplan-plugin` to your local_requirements.txt

netbox_floorplan/__init__.py

@@ -1,15 +1,16 @@
 from netbox.plugins import PluginConfig
+from .version import __version__
 
 
 class FloorplanConfig(PluginConfig):
 
     name = "netbox_floorplan"
     verbose_name = "Netbox Floorplan"
     description = ""
-    version = "0.4.1"
+    version = __version__
     base_url = "floorplan"
-    min_version = "4.0.2"
-    max_version = "4.0.11"
+    min_version = "4.1.0"
+    max_version = "4.1.99"
 
 
 config = FloorplanConfig

netbox_floorplan/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+from .models import Floorplan
+
+
+@admin.register(Floorplan)
+class FloorplanAdmin(admin.ModelAdmin):
+    list_display = (
+        "pk",
+    )

netbox_floorplan/api/serializers.py

@@ -1,14 +1,25 @@
 from rest_framework import serializers
 from netbox.api.serializers import NetBoxModelSerializer
-from ..models import Floorplan
+from ..models import Floorplan, FloorplanImage
+
+
+class FloorplanImageSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='plugins-api:netbox_floorplan-api:floorplanimage-detail')
+
+    class Meta:
+        model = FloorplanImage
+        fields = ['id', 'url', 'name', 'file', 'external_url', 'filename', 'comments', 'tags', 'custom_fields', 'created', 'last_updated']
+        brief_fields = ['id', 'url', 'name', 'file', 'filename', 'external_url']
 
 
 class FloorplanSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name='plugins-api:netbox_floorplan-api:floorplan-detail')
+    assigned_image = FloorplanImageSerializer(nested=True, required=False, allow_null=True)
 
     class Meta:
         model = Floorplan
-        fields = ['id', 'url', 'site', 'location', 'background_image',
+        fields = ['id', 'url', 'site', 'location', 'assigned_image',
                   'width', 'height', 'tags', 'custom_fields', 'created',
                   'last_updated', 'canvas', 'measurement_unit']

netbox_floorplan/api/urls.py

@@ -5,5 +5,5 @@
 
 router = NetBoxRouter()
 router.register('floorplans', views.FloorplanViewSet)
-
+router.register('floorplanimages', views.FloorplanImageViewSet)
 urlpatterns = router.urls

netbox_floorplan/api/views.py

@@ -1,10 +1,15 @@
 from netbox.api.viewsets import NetBoxModelViewSet
 
 from .. import filtersets, models
-from .serializers import FloorplanSerializer
+from .serializers import FloorplanSerializer, FloorplanImageSerializer
 
 
 class FloorplanViewSet(NetBoxModelViewSet):
     queryset = models.Floorplan.objects.all()
     serializer_class = FloorplanSerializer
     filterset_class = filtersets.FloorplanFilterSet
+
+
+class FloorplanImageViewSet(NetBoxModelViewSet):
+    queryset = models.FloorplanImage.objects.prefetch_related('tags')
+    serializer_class = FloorplanImageSerializer

netbox_floorplan/forms.py

@@ -1,12 +1,32 @@
 from netbox.forms import NetBoxModelForm
-from .models import Floorplan
+from .models import Floorplan, FloorplanImage
 from dcim.models import Rack, Device
+from utilities.forms.rendering import FieldSet
+from utilities.forms.fields import CommentField
+
+
+class FloorplanImageForm(NetBoxModelForm):
+
+    comments = CommentField()
+
+    fieldsets = (
+        FieldSet(('name', 'file', 'external_url', 'comments'), name='General'),
+        FieldSet(('comments', 'tags'), name='')
+    )
+
+    class Meta:
+        model = FloorplanImage
+        fields = [
+            'name',
+            'file',
+            'external_url'
+        ]
 
 
 class FloorplanForm(NetBoxModelForm):
     class Meta:
         model = Floorplan
-        fields = ['site', 'location', 'background_image', 'width', 'height']
+        fields = ['site', 'location', 'assigned_image', 'width', 'height']
 
 
 class FloorplanRackFilterForm(NetBoxModelForm):

netbox_floorplan/migrations/0008_floorplanimage.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.0.7 on 2024-07-19 23:49
+
+import taggit.managers
+import utilities.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0115_convert_dashboard_widgets'),
+        ('netbox_floorplan', '0007_alter_floorplan_options_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='FloorplanImage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('created', models.DateTimeField(auto_now_add=True, null=True)),
+                ('last_updated', models.DateTimeField(auto_now=True, null=True)),
+                ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder)),
+                ('name', models.CharField(max_length=128)),
+                ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')),
+            ],
+            options={
+                'ordering': ('name',),
+            },
+        ),
+    ]

netbox_floorplan/migrations/0009_floorplanimage_file.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-07-20 19:02
+
+import netbox_floorplan.utils
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_floorplan', '0008_floorplanimage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='floorplanimage',
+            name='file',
+            field=models.FileField(blank=True, upload_to=netbox_floorplan.utils.file_upload),
+        ),
+    ]