version bump 0.94

README.rst

@@ -20,7 +20,7 @@ to install the Netbox SLM plugin:
 
 1. Add ``netbox_slm`` to the ``PLUGINS`` list in
    ``configuration/configuration.py``.
-2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.9`` as
+2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.93`` as
    contents.
 3. Create a ``Dockerfile-SLM`` with contents:
 
@@ -63,6 +63,7 @@ directory run
 
 ::
 
+   # make sure to update the version in netbox_slm/__init__.py
    $ python setup.py sdist
    $ twine upload dist/*
 

src/README.md

@@ -1,187 +0,0 @@
-## Software Lifecycle Management
-
-### _Netbox Plugin for lifecycle management of software components, including versions and installations_
-
----
-
-### Installation Guide
-
-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 instructions](https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins)) to install the Netbox SLM plugin:
-
-1. Add `netbox_slm` to the `PLUGINS` list in `configuration/configuration.py`.
-2. Create a `plugin_requirements.txt` with `netbox-slm==0.9` as contents.
-3. Create a `Dockerfile-SLM` with contents:
-
-```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
-
-COPY ./plugin_requirements.txt /
-RUN /opt/netbox/venv/bin/pip install --no-warn-script-location -r /plugin_requirements.txt
-```
-
-4. Create a `docker-compose.override.yml` with contents:
-
-```yaml
-version: '3.4'
-services:
-  netbox:
-    ports:
-      - 8000:8080
-    build:
-      context: .
-      dockerfile: Dockerfile-SLM
-    image: netbox:slm
-  netbox-worker:
-    image: netbox:slm
-  netbox-housekeeping:
-    image: netbox:slm
-```
-
-Now, build the image: `docker compose build --no-cache`
-
-And finally, run Netbox with the SLM plugin: `docker compose up`
-
-### Releasing Guide
-
-To draft a release;
-
-update the setup.py file to reflect the new version, then from the *src* directory run
-
-```
-$ python setup.py sdist
-$ twine upload dist/*
-```
-
-On Github.com create a similar tag and version. These steps could be automated with a github workflow.
-
-n.b. Currently the plugin is configured to use a personal pypi account, this should be changed.
-
-### Developer Guide (local installation)
-
-_Follow the steps below on your local system to run netbox and the netbox_slm plugin in developer mode_
-
-### Setup
-
-The goal below is to run all Netbox components in Docker and run a local 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
-
-```
-from your projects directory clone the netbox repository
-
-$ git clone https://github.com/netbox-community/netbox
-$ cd netbox
-$ git checkout f5356b8 (to pin 3.0.9)
-
-install the virtual environment
-
-$ pipenv shell
-$ pipenv install
-
-create and edit netbox/configuration.py (based on the template file) add these lines at the end of the file;
-
-DEBUG = True
-SECRET_KEY = 'dummy'
-DEVELOPER = True
-PLUGINS = [
-    'netbox_slm',
-]
-````
-
-The Netbox installation above will be used to run Django management commands like runserver, makemigrations and migrate, which will be explained in the next steps below;
-
-```
-from your projects directory clone the netbox-slm repository
-
-$ git clone https://github.com/ICTU/netbox_slm
-$ cd netbox_slm
-$ ./start-netbox.sh
-````
-
-This will start Netbox locally (requires Docker) and forward the redis and postgres ports to the localhost (make sure there's no processes using these ports or change the dockerfiles accordingly)
-
-Note, you can also start and stop netbox by hand:
-```
-$ cd netbox-docker
-$ docker-compose up -d
-
-or stop the stack with
-
-$ docker-compose down
-
-# to start fresh:
-
-$ docker-compose down
-$ docker volume rm netbox-docker_netbox-postgres-data  # et cetera
-$ docker-compose up -d --force-recreate
-
-this will require you to re-run the migrate commando's for netbox-slm, see further down below
-```
-
-Go back to the netbox configuration.py file and update the postgres and redis connection strings (username, password) to the ones the netbox docker backend is using, for example (using default user and passwords from the netbox docker example):
-
-```
-<<collapsed>>
-
-# PostgreSQL database configuration. See the Django documentation for a complete list of available parameters:
-#   https://docs.djangoproject.com/en/stable/ref/settings/#databases
-DATABASE = {
-    'NAME': 'netbox',               # Database name
-    'USER': 'netbox',               # PostgreSQL username
-    'PASSWORD': 'J5brHrAXFLQSif0K', # PostgreSQL password
-    'HOST': 'localhost',            # Database server
-    'PORT': '',                     # Database port (leave blank for default)
-    'CONN_MAX_AGE': 300,            # Max database connection age
-}
-
-# Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate
-# configuration exists for each. Full connection details are required in both sections, and it is strongly recommended
-# to use two separate database IDs.
-REDIS = {
-    'tasks': {
-        'HOST': 'localhost',
-        'PORT': 6379,
-        # Comment out `HOST` and `PORT` lines and uncomment the following if using Redis Sentinel
-        # 'SENTINELS': [('mysentinel.redis.example.com', 6379)],
-        # 'SENTINEL_SERVICE': 'netbox',
-        'PASSWORD': 'H733Kdjndks81',
-        'DATABASE': 0,
-        'SSL': False,
-        # Set this to True to skip TLS certificate verification
-        # This can expose the connection to attacks, be careful
-        # 'INSECURE_SKIP_TLS_VERIFY': False,
-    },
-    'caching': {
-        'HOST': 'localhost',
-        'PORT': 6379,
-        # Comment out `HOST` and `PORT` lines and uncomment the following if using Redis Sentinel
-        # 'SENTINELS': [('mysentinel.redis.example.com', 6379)],
-        # 'SENTINEL_SERVICE': 'netbox',
-        'PASSWORD': 'H733Kdjndks81',
-        'DATABASE': 1,
-        'SSL': False,
-        # Set this to True to skip TLS certificate verification
-        # This can expose the connection to attacks, be careful
-        # 'INSECURE_SKIP_TLS_VERIFY': False,
-    }
-}
-
-<<collapsed>>
-```
-
-Now you can run commands from the netbox repository like this;
-
-```
-$ cd netbox/netbox
-$ export PYTHONPATH=../../netbox-slm/src/
-$ python3 manage.py migrate netbox_slm
-$ python3 manage.py runserver 8001
-```
-
-Visit http://127.0.0.1:8001 in the browesr to see the auto reloading version of the netbox UI. Port 8000 is taken by the docker ran variant.

src/README.rst

@@ -20,7 +20,7 @@ to install the Netbox SLM plugin:
 
 1. Add ``netbox_slm`` to the ``PLUGINS`` list in
    ``configuration/configuration.py``.
-2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.9`` as
+2. Create a ``plugin_requirements.txt`` with ``netbox-slm==0.93`` as
    contents.
 3. Create a ``Dockerfile-SLM`` with contents:
 
@@ -63,6 +63,7 @@ directory run
 
 ::
 
+   # make sure to update the version in netbox_slm/__init__.py and setup.cfg
    $ python setup.py sdist
    $ twine upload dist/*
 

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.1'
+    version = '0.94'
     author = 'Hedde van der Heide'
     author_email = 'hedde.vanderheide@ictu.nl'
     base_url = 'slm'

src/netbox_slm/api/serializers.py

@@ -21,7 +21,7 @@ class SoftwareProductSerializer(PrimaryModelSerializer):
         ]
 
     def get_display(self, obj):
-        return obj.name
+        return f"{obj.manufacturer.name} - {obj.name}"
 
 
 class SoftwareProductVersionSerializer(PrimaryModelSerializer):

src/netbox_slm/forms.py

@@ -74,7 +74,6 @@ class SoftwareProductVersionForm(BootstrapMixin, CustomFieldModelForm):
 
     software_product = DynamicModelChoiceField(
         queryset=SoftwareProduct.objects.all(),
-        required=False,
         widget=APISelect(
             attrs={"data-url": reverse_lazy("plugins-api:netbox_slm-api:softwareproduct-list")}
         ),
@@ -171,9 +170,10 @@ class SoftwareProductInstallationForm(BootstrapMixin, CustomFieldModelForm):
         model = SoftwareProductInstallation
         fields = ("device", "virtualmachine", "software_product", "version",)  # "tags")
 
-    # def clean(self):
+    def clean(self):
-    #     import pdb;pdb.set_trace()
+        if not any([self.cleaned_data['device'], self.cleaned_data['virtualmachine']]):
-    #     return super(SoftwareProductInstallationForm, self).clean()
+            raise forms.ValidationError(_("Installation requires atleast one virtualmachine or device destination."))
+        return super(SoftwareProductInstallationForm, self).clean()
 
 
 class SoftwareProductInstallationFilterForm(BootstrapMixin, CustomFieldModelFilterForm):

src/netbox_slm/migrations/0002_alter_softwareproduct_manufacturer.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.9 on 2022-01-24 08:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0133_port_colors'),
+        ('netbox_slm', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='softwareproduct',
+            name='manufacturer',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='software_products', to='dcim.manufacturer'),
+        ),
+    ]

src/netbox_slm/models.py

@@ -17,7 +17,8 @@ class SoftwareProduct(PrimaryModel):
     manufacturer = models.ForeignKey(
         to='dcim.Manufacturer',
         on_delete=models.PROTECT,
-        related_name='software_products'
+        related_name='software_products',
+        null=True, blank=True
     )
 
     objects = RestrictedQuerySet.as_manager()
@@ -95,3 +96,9 @@ class SoftwareProductInstallation(PrimaryModel):
 
     def get_absolute_url(self):
         return reverse("plugins:netbox_slm:softwareproductinstallation", kwargs={"pk": self.pk})
+
+    def get_platform(self):
+        return self.device or self.virtualmachine
+
+    def render_type(self):
+        return f"{'device' if self.device else 'virtualmachine'}"

src/netbox_slm/tables.py

@@ -37,6 +37,12 @@ class SoftwareProductTable(BaseTable):
             "installations",
             # "tags",
         )
+        sequence = (
+            "manufacturer",
+            "name",
+            "description",
+            "installations",
+        )
 
 
 class SoftwareProductVersionTable(BaseTable):
@@ -76,6 +82,12 @@ class SoftwareProductVersionTable(BaseTable):
             "installations",
             # "tags",
         )
+        sequence = (
+            "manufacturer",
+            "software_product",
+            "name",
+            "installations",
+        )
 
 
 class SoftwareProductInstallationTable(BaseTable):
@@ -91,6 +103,11 @@ class SoftwareProductInstallationTable(BaseTable):
         accessor=Accessor('virtualmachine'),
         linkify=True
     )
+    platform = tables.Column(
+        accessor='get_platform',
+        linkify=True
+    )
+    type = tables.Column(accessor='render_type')
     software_product = tables.Column(
         accessor=Accessor('software_product'),
         linkify=True
@@ -109,17 +126,20 @@ class SoftwareProductInstallationTable(BaseTable):
         fields = (
             "pk",
             "name",
-            "device",
+            "platform",
-            "virtualmachine",
+            "type",
             "software_product",
             "version",
             # "tags",
         )
         default_columns = (
             "pk",
-            "device",
+            "platform",
-            "virtualmachine",
+            "type",
             "software_product",
             "version",
             # "tags",
         )
+
+    def render_software_product(self, value, **kwargs):
+        return f"{kwargs['record'].software_product.manufacturer.name} - {value}"

src/netbox_slm/templates/netbox_slm/softwareproductversion.html

@@ -25,11 +25,7 @@
                     <tr>
                         <th scope="row">Installations</th>
                         <td>
-<!--                        {% for version in object.softwareproduct_versions.all %}-->
+                            {{ object.get_installation_count }}
-<!--                            <a href="{% url 'plugins:netbox_slm:softwareproductversion' pk=version.pk %}">-->
-<!--                                <span class="badge" style="color: #ffffff; background-color: #9e9e9e">{{ version }}</span>-->
-<!--                            </a>-->
-<!--                        {% endfor %}-->
                         </td>
                     </tr>
                 </table>

src/netbox_slm/views.py

@@ -78,9 +78,9 @@ class SoftwareProductVersionView(generic.ObjectView):
 
     queryset = SoftwareProductVersion.objects.all()
 
-    # def get_extra_context(self, request, instance):
+    def get_extra_context(self, request, instance):
-    #     records = instance.record_set.all()
+        installation_count = instance.get_installation_count()
-    #     return {"records": records}
+        return {"installations": installation_count}
 
 
 class SoftwareProductVersionEditView(generic.ObjectEditView):
@@ -127,7 +127,7 @@ class SoftwareProductInstallationListView(generic.ObjectListView):
 class SoftwareProductInstallationView(generic.ObjectView):
     """Display SoftwareProductInstallation details"""
 
-    queryset = SoftwareProductVersion.objects.all()
+    queryset = SoftwareProductInstallation.objects.all()
 
     # def get_extra_context(self, request, instance):
     #     records = instance.record_set.all()

src/setup.cfg

@@ -1,8 +1,9 @@
 [metadata]
 name = netbox-slm
-version = 0.91
+version = 0.94
 description = Software Lifecycle Management Netbox Plugin.
-long_description = file: README.rst
+# long_description = file: README.rst
+# long_description_content_type='text/x-rst'
 author = Hedde van der Heide
 author_email = hedde.vanderheide@ictu.nl
 license = Apache 2.0
@@ -15,6 +16,7 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Topic :: Internet :: WWW/HTTP
@@ -23,6 +25,4 @@ classifiers =
 [options]
 include_package_data = true
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.7
-install_requires =
-    Netbox >= 3.0.9