bumped version

README.rst

@@ -9,6 +9,8 @@ Software Lifecycle Management
 Installation Guide
 ~~~~~~~~~~~~~~~~~~
 
+WARNING: This plugin is only tested with Netbox 3.2 at this time.
+
 When using the Docker version of Netbox, first follow the `netbox-docker
 quickstart <https://github.com/netbox-community/netbox-docker#quickstart>`__
 instructions to clone the netbox-docker repo and set up the
@@ -20,13 +22,13 @@ to install the Netbox SLM plugin:
 
 1. Add ``netbox_slm`` to the ``PLUGINS`` list in
    ``configuration/extra.py``.
-2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.94`` as
+2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.98`` as
    contents.
 3. Create a ``Dockerfile-SLM`` with contents:
 
 .. code:: dockerfile
 
-   FROM netboxcommunity/netbox:v3.X.X
+   FROM netboxcommunity/netbox:v3.2.X
 
    COPY ./plugin_requirements.txt /
    RUN /opt/netbox/venv/bin/pip install --no-warn-script-location -r /plugin_requirements.txt
@@ -96,7 +98,6 @@ Steps
 
    $ git clone https://github.com/netbox-community/netbox
    $ cd netbox
-   $ git checkout f5356b8 (to pin 3.0.9)
 
    install the virtual environment
 

src/README.rst

@@ -9,24 +9,26 @@ Software Lifecycle Management
 Installation Guide
 ~~~~~~~~~~~~~~~~~~
 
+WARNING: This plugin is only tested with Netbox 3.2 at this time.
+
 When using the Docker version of Netbox, first follow the `netbox-docker
 quickstart <https://github.com/netbox-community/netbox-docker#quickstart>`__
 instructions to clone the netbox-docker repo and set up the
 ``docker-compose.override.yml``.
 
-Next, follow these instructions (based on the generic `Netbox plugin
+Next, follow these instructions (based on the `Netbox docker variant
-instructions <https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins>`__)
+instructions <https://github.com/netbox-community/netbox-docker/wiki/Configuration#custom-configuration-files>`__)
 to install the Netbox SLM plugin:
 
 1. Add ``netbox_slm`` to the ``PLUGINS`` list in
-   ``configuration/configuration.py``.
+   ``configuration/extra.py``.
-2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.93`` as
+2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.98`` as
    contents.
 3. Create a ``Dockerfile-SLM`` with contents:
 
 .. code:: dockerfile
 
-   FROM netboxcommunity/netbox:v3.0.9  # The Netbox SLM plugin currently only works with v3.0.9 of Netbox due to backwards incompatible changes in newer version of Netbox
+   FROM netboxcommunity/netbox:v3.2.X
 
    COPY ./plugin_requirements.txt /
    RUN /opt/netbox/venv/bin/pip install --no-warn-script-location -r /plugin_requirements.txt
@@ -63,7 +65,7 @@ directory run
 
 ::
 
-   # make sure to update the version in netbox_slm/__init__.py and setup.cfg
+   # make sure to update the version in netbox_slm/__init__.py
    $ python setup.py sdist
    $ twine upload dist/*
 
@@ -87,15 +89,6 @@ Netbox Django copy with auto-reload to develop the plugin pointing to
 the Dockerized postgres and redis instances, basically ignoring the
 netbox docker runtime server.
 
-Gotcha’s
-~~~~~~~~
-
-*Netbox’s exception handler seems to supress initial Exceptions,
-obfuscating missing imports or other Django related issues by re-raising
-an opague error, e.g. netbox_slm plugin namespace doesnotexist. It’s
-recommended to often check the runtime server or patch Netbox’s global
-exception handler.*
-
 Steps
 ~~~~~
 
@@ -105,7 +98,6 @@ Steps
 
    $ git clone https://github.com/netbox-community/netbox
    $ cd netbox
-   $ git checkout f5356b8 (to pin 3.0.9)
 
    install the virtual environment
 

src/netbox_slm/__init__.py

@@ -5,7 +5,7 @@ class SLMConfig(PluginConfig):
     name = 'netbox_slm'
     verbose_name = 'Software Lifecycle Management'
     description = 'Software Lifecycle Management'
-    version = '0.95'
+    version = '0.98'
     author = 'Hedde van der Heide'
     author_email = 'hedde.vanderheide@ictu.nl'
     base_url = 'slm'

src/netbox_slm/migrations/0004_auto_20220415_0705.py

@@ -0,0 +1,46 @@
+# Generated by Django 3.2.9 on 2022-04-15 07:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0153_created_datetimefield'),
+        ('virtualization', '0029_created_datetimefield'),
+        ('netbox_slm', '0003_auto_20220407_1209'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='softwareproduct',
+            name='manufacturer',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.manufacturer'),
+        ),
+        migrations.AlterField(
+            model_name='softwareproductinstallation',
+            name='device',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.device'),
+        ),
+        migrations.AlterField(
+            model_name='softwareproductinstallation',
+            name='software_product',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='netbox_slm.softwareproduct'),
+        ),
+        migrations.AlterField(
+            model_name='softwareproductinstallation',
+            name='version',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='netbox_slm.softwareproductversion'),
+        ),
+        migrations.AlterField(
+            model_name='softwareproductinstallation',
+            name='virtualmachine',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='virtualization.virtualmachine'),
+        ),
+        migrations.AlterField(
+            model_name='softwareproductversion',
+            name='software_product',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='netbox_slm.softwareproduct'),
+        ),
+    ]

src/netbox_slm/models.py

@@ -17,7 +17,6 @@ class SoftwareProduct(NetBoxModel):
     manufacturer = models.ForeignKey(
         to='dcim.Manufacturer',
         on_delete=models.PROTECT,
-        related_name='software_products',
         null=True, blank=True
     )
 
@@ -42,7 +41,6 @@ class SoftwareProductVersion(NetBoxModel):
     software_product = models.ForeignKey(
         to='netbox_slm.SoftwareProduct',
         on_delete=models.PROTECT,
-        related_name='softwareproduct_versions'
     )
     name = models.CharField(max_length=64)
 
@@ -67,26 +65,22 @@ class SoftwareProductInstallation(NetBoxModel):
     device = models.ForeignKey(
         to='dcim.Device',
         on_delete=models.PROTECT,
-        related_name='softwareproduct_installations',
         null=True,
         blank=True
     )
     virtualmachine = models.ForeignKey(
         to='virtualization.VirtualMachine',
         on_delete=models.PROTECT,
-        related_name='softwareproduct_installations',
         null = True,
         blank = True
     )
     software_product = models.ForeignKey(
         to='netbox_slm.SoftwareProduct',
         on_delete=models.PROTECT,
-        related_name='software_products'
     )
     version = models.ForeignKey(
         to='netbox_slm.SoftwareProductVersion',
         on_delete=models.PROTECT,
-        related_name='softwareproduct_versions'
     )
 
     objects = RestrictedQuerySet.as_manager()

src/netbox_slm/tables.py

@@ -1,5 +1,6 @@
 import django_tables2 as tables
 
+from django.db.models import Count
 from django_tables2.utils import Accessor
 from netbox_slm.models import SoftwareProduct, SoftwareProductVersion, SoftwareProductInstallation
 from netbox.tables import NetBoxTable, ChoiceFieldColumn, ToggleColumn, columns
@@ -45,6 +46,12 @@ class SoftwareProductTable(NetBoxTable):
             "installations",
         )
 
+    def order_installations(self, queryset, is_descending):
+        queryset = queryset.annotate(
+            count=Count('softwareproductinstallation__id')
+        ).order_by(("-" if is_descending else "") + "count")
+        return queryset, True
+
 
 class SoftwareProductVersionTable(NetBoxTable):
     """Table for displaying SoftwareProductVersion objects."""
@@ -90,6 +97,12 @@ class SoftwareProductVersionTable(NetBoxTable):
             "installations",
         )
 
+    def order_installations(self, queryset, is_descending):
+        queryset = queryset.annotate(
+            count=Count('softwareproductinstallation__id')
+        ).order_by(("-" if is_descending else "") + "count")
+        return queryset, True
+
 
 class SoftwareProductInstallationTable(NetBoxTable):
     """Table for displaying SoftwareProductInstallation objects."""
@@ -142,5 +155,13 @@ class SoftwareProductInstallationTable(NetBoxTable):
             "tags",
         )
 
+    def order_platform(self, queryset, is_descending):
+        queryset = queryset.order_by(("device" if is_descending else "virtualmachine"))
+        return queryset, True
+
+    def order_type(self, queryset, is_descending):
+        queryset = queryset.order_by(("device" if is_descending else "virtualmachine"))
+        return queryset, True
+
     def render_software_product(self, value, **kwargs):
         return f"{kwargs['record'].software_product.manufacturer.name} - {value}"

src/netbox_slm/templates/netbox_slm/softwareproduct.html

@@ -24,6 +24,8 @@
                             <a href="{% url 'plugins:netbox_slm:softwareproductversion' pk=version.pk %}">
                                 <span class="badge" style="color: #ffffff; background-color: #9e9e9e">{{ version }}</span>
                             </a>
+                        {% empty %}
+                            n/a
                         {% endfor %}
                         </td>
                     </tr>

src/netbox_slm/views.py

@@ -28,7 +28,7 @@ class SoftwareProductView(generic.ObjectView):
     queryset = SoftwareProduct.objects.all()
 
     def get_extra_context(self, request, instance):
-        versions = instance.softwareproduct_versions.all()
+        versions = instance.softwareproductversion_set.all()
         return {"versions": versions}
 
 

src/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = netbox-slm
-version = 0.95
+version = 0.98
 description = Software Lifecycle Management Netbox Plugin.
 # long_description = file: README.rst
 # long_description_content_type='text/x-rst'