Update PluginMenuItem permissions and remove bulk import/edit (#41 )

Closes #37
Prepare for upgrade to NetBox v4.0.6 (#40 )
2024-07-09 23:00:58 +02:00 · 2024-07-09 22:15:58 +02:00 · 2024-02-13 12:11:49 +01:00
34 changed files with 620 additions and 484 deletions
@@ -11,14 +11,14 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4

    - name: Build the Docker image
      run: docker compose build --no-cache

    - name: Verify the Docker image
-      # clearcache is provided by Django extras, which is not loaded if netbox-slm cannot be loaded
-      run: docker compose run netbox sh -c "/opt/netbox/venv/bin/python manage.py clearcache"
+      # smoke test by checking if the migrations for app netbox_slm can be displayed
+      run: docker compose run netbox sh -c "/opt/netbox/venv/bin/python manage.py showmigrations netbox_slm"

    - name: Run Django tests with coverage for netbox_slm
      run: |
@@ -11,18 +11,18 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4

    - name: Set up Python
      uses: actions/setup-python@v4
      with:
-        python-version: "3.9"
+        python-version: "3.11"

    - name: Install tools
      run: pip install .[tools]

-    - name: Run ruff
-      run: ruff netbox_slm
+    - name: Run ruff lint
+      run: ruff check netbox_slm

-    - name: Run black
-      run: black netbox_slm
+    - name: Run ruff format
+      run: ruff format netbox_slm
@@ -0,0 +1,133 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement by
+[opening a new issue in this repository's issue tracker][open issue].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
+[open issue]: https://github.com/ICTU/netbox_slm/issues/new
@@ -0,0 +1,34 @@
+# NetBox SLM contributing guidelines
+
+## What do I need to know to help?
+
+If you are looking to help to with a code contribution our project uses, you can find inspiration in the [issue list](https://github.com/ICTU/netbox_slm/issues/).
+Additionally, review the [README](./README.md) document and [NetBox Plugin Development](https://docs.netbox.dev/en/stable/plugins/development/) docs.
+
+## How do I make a contribution?
+
+Never made an open source contribution before? Wondering how contributions work in the in our project? Here's a quick rundown!
+
+1. Find an issue that you are interested in addressing or a feature that you would like to add.
+2. Fork the repository associated with the issue to your local GitHub organization. This means that you will have a copy of the repository under **your-GitHub-username/repository-name**.
+3. Clone the repository to your local machine using `git clone https://github.com/github-username/repository-name.git`.
+4. Create a new branch for your fix using `git checkout -b branch-name-here`.
+5. Make the appropriate changes for the issue you are trying to address or the feature that you want to add.
+6. Use git `add insert-paths-of-changed-files-here` to add the file contents of the changed files to the "snapshot" git uses to manage the state of the project, also known as the index.
+7. Use `git commit -m "Insert a short message of the changes made here"` to store the contents of the index with a descriptive message.
+8. Push the changes to the remote repository using `git push origin branch-name-here`.
+9. Submit a pull request to the upstream repository.
+10. Title the pull request with a short description of the changes made and the issue or bug number associated with your change. For example, you can title an issue like so "Added more log outputting to resolve #4352".
+11. In the description of the pull request, explain the changes that you made, any issues you think exist with the pull request you made, and any questions you have for the maintainer. It's OK if your pull request is not perfect (no pull request is), the reviewer will be able to help you fix any problems and improve it!
+12. Wait for the pull request to be reviewed by a maintainer.
+13. Make changes to the pull request if the reviewing maintainer recommends them.
+14. Celebrate your success after your pull request is merged!
+
+## Where can I go for help?
+
+If you need help, you can ask questions by [opening a new issue in this repository's issue tracker](https://github.com/ICTU/netbox_slm/issues/new).
+
+## What does the Code of Conduct mean for me?
+
+Our [Code of Conduct](./CODE_OF_CONDUCT.md) means that you are responsible for treating everyone on the project with respect and courtesy regardless of their identity.
+If you are the victim of any inappropriate behavior or comments as described in our Code of Conduct, we are here for you and will do the best to ensure that the abuser is reprimanded appropriately, per our code.
@@ -1,6 +1,6 @@
-<h1 align="center">NetBox SLM</h1>
+# NetBox SLM

-<p align="center"><i>Netbox SLM is a plugin for lifecycle management of software components, including versions and installations.</i></p>
+<p align="center"><i>NetBox SLM is a plugin for lifecycle management of software components, including versions and installations.</i></p>

 <div align="center">
 <a href="https://pypi.org/project/netbox_slm/"><img src="https://img.shields.io/pypi/v/netbox_slm" alt="PyPi"/></a>
@@ -15,16 +15,16 @@

 ## Known Issues

- WARNING: This plugin is only tested with a single Netbox version at this time.
+- WARNING: This plugin is only tested with a single NetBox version at this time.
 - CSV/Bulk imports for SoftwareProduct, Version and Installation are currently broken (WIP)

 ## 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``.
+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 Netbox docker variant
+Next, follow these instructions (based on the NetBox docker variant
 [instructions](https://github.com/netbox-community/netbox-docker/wiki/Configuration#custom-configuration-files))
-to install the Netbox SLM plugin:
+to install the NetBox SLM plugin:

 1. Add ``netbox_slm`` to the ``PLUGINS`` list in
   ``configuration/plugins.py``.
@@ -59,7 +59,7 @@ to install the Netbox SLM plugin:

 Now, build the image: ``docker compose build --no-cache``

-And finally, run Netbox with the SLM plugin: ``docker compose up``
+And finally, run NetBox with the SLM plugin: ``docker compose up``

 ## Releasing Guide

@@ -84,8 +84,8 @@ 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 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.

@@ -116,7 +116,7 @@ netbox docker runtime server.
   ]
   ```

-The Netbox installation above will be used to run Django management
+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;

@@ -128,7 +128,7 @@ explained in the next steps below;
   $ ./start-netbox.sh
   ```
   
-This will start Netbox locally (requires Docker) and forward the redis
+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)

@@ -220,3 +220,8 @@ Now you can run commands from the netbox repository like this;

 Visit http://127.0.0.1:8001 in the browser to see the auto reloading
 version of the netbox UI. Port 8000 is taken by the docker ran variant.
+
+
+## Get in touch
+
+Point of contact for this repository is [Mart Visser](https://github.com/MartVisser), who can be reached by [opening a new issue in this repository's issue tracker](https://github.com/ICTU/netbox_slm/issues/new).
@@ -1,13 +1,16 @@
-# Security Policy
+# NetBox SLM Security Policy

 ## Current status

-Netbox SLM is a plugin for Netbox with mostly default configuration. We advise to monitor Netbox security findings and update accordingly.
+NetBox SLM is a plugin for [NetBox](https://github.com/netbox-community/netbox/) with mostly default configuration.
+In order to stay up to date, monitor NetBox security findings and update accordingly.

 ## Supported Versions

-Only the latest version of Netbox SLM is currently being supported with security updates. We aim to keep the plugin compatible with the latest Netbox version, but have no incentive to patch older tags at this point.
+Only the latest version of NetBox SLM is currently being supported with security updates.
+The intention is to keep the plugin compatible with the most recent NetBox version(s), there is no incentive to patch older tags.

 ## Reporting a Vulnerability

-Please report security vulnerabilities by opening a ticket. The aim is to get back to you within 24 hours with a confirmation of the issue and a brief action plan or a request for more information. 
+You can privately [report a vulnerability issue in this repository's issue tracker](https://github.com/ICTU/netbox_slm/security/advisories/new).
+The aim is to get back to you within 24 hours, with a confirmation of the issue and a brief action plan or a request for more information.
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.10
+ARG PYTHON_VERSION=3.11
 FROM python:${PYTHON_VERSION}-alpine AS compile-image

 WORKDIR /build
@@ -11,7 +11,7 @@ RUN pip install -U .[build]
 RUN python -m build
 RUN pip install --no-index /build

-FROM netboxcommunity/netbox:v3.6.1
+FROM netboxcommunity/netbox:v4.0.6

-ARG PYTHON_VERSION=3.10
+ARG PYTHON_VERSION=3.11
 COPY --from=compile-image /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm
@@ -1,4 +1,4 @@
-FROM netboxcommunity/netbox:v3.6.1
+FROM netboxcommunity/netbox:v4.0.6

 RUN mkdir /ci && chmod go+w /ci
 COPY ../ci/requirements_ci.txt /ci/
@@ -1,4 +1,4 @@
-version: '3.7'
+---
 services:
  netbox:
    ports:
@@ -1,7 +1,7 @@
-version: '3.7'
+---
 services:
  netbox: &netbox
-    image: netboxcommunity/netbox:${VERSION-v3.6.1}
+    image: netboxcommunity/netbox:${VERSION-v4.0.6}
    depends_on:
    - postgres
    - redis
@@ -1,2 +1,2 @@
-coverage==7.2.2
+coverage==7.5.4
 unittest-xml-reporting==3.2.0
@@ -1,6 +1,6 @@
-from extras.plugins import PluginConfig
+from netbox.plugins import PluginConfig

-__version__ = "1.5"
+__version__ = "1.7.0"


 class SLMConfig(PluginConfig):
@@ -4,49 +4,65 @@ from netbox.api.serializers import NetBoxModelSerializer
 from netbox_slm.models import SoftwareProduct, SoftwareProductVersion, SoftwareProductInstallation, SoftwareLicense


+class SoftwareLicenseSerializer(NetBoxModelSerializer):
+    display = serializers.SerializerMethodField()
+    url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwarelicense-detail")
+
+    class Meta:
+        model = SoftwareLicense
+        fields = (
+            "id",
+            "display",
+            "url",
+            "name",
+            "description",
+            "type",
+            "stored_location",
+            "stored_location_url",
+            "start_date",
+            "expiration_date",
+            "support",
+            "license_amount",
+            "software_product",
+            "version",
+            "installation",
+            "tags",
+            "comments",
+            "custom_field_data",
+            "created",
+            "last_updated",
+        )
+        brief_fields = ("id", "display", "url", "name", "description")
+
+    def get_display(self, obj):
+        return f"{obj}"
+
+
 class SoftwareProductSerializer(NetBoxModelSerializer):
    display = serializers.SerializerMethodField()
    url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproduct-detail")

    class Meta:
        model = SoftwareProduct
-        fields = [
+        fields = (
            "id",
            "display",
            "url",
            "name",
+            "manufacturer",
+            "description",
            "tags",
+            "comments",
            "custom_field_data",
            "created",
            "last_updated",
-        ]
+        )
+        brief_fields = ("id", "display", "url", "name", "description")

    def get_display(self, obj):
        return f"{obj.manufacturer} - {obj}"


-class SoftwareProductVersionSerializer(NetBoxModelSerializer):
-    display = serializers.SerializerMethodField()
-    url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproductversion-detail")
-
-    class Meta:
-        model = SoftwareProductVersion
-        fields = [
-            "id",
-            "display",
-            "url",
-            "name",
-            "software_product",
-            "tags",
-            "custom_field_data",
-            "created",
-            "last_updated",
-        ]
-
-    def get_display(self, obj):
-        return f"{obj}"
-
-
 class SoftwareProductInstallationSerializer(NetBoxModelSerializer):
    display = serializers.SerializerMethodField()
    url = serializers.HyperlinkedIdentityField(
@@ -55,7 +71,7 @@ class SoftwareProductInstallationSerializer(NetBoxModelSerializer):

    class Meta:
        model = SoftwareProductInstallation
-        fields = [
+        fields = (
            "id",
            "display",
            "url",
@@ -65,39 +81,43 @@ class SoftwareProductInstallationSerializer(NetBoxModelSerializer):
            "software_product",
            "version",
            "tags",
+            "comments",
            "custom_field_data",
            "created",
            "last_updated",
-        ]
+        )
+        brief_fields = ("id", "display", "url", "name")

    def get_display(self, obj):
        return f"{obj}"


-class SoftwareLicenseSerializer(NetBoxModelSerializer):
+class SoftwareProductVersionSerializer(NetBoxModelSerializer):
    display = serializers.SerializerMethodField()
-    url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwarelicense-detail")
+    url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproductversion-detail")

    class Meta:
-        model = SoftwareLicense
-        fields = [
+        model = SoftwareProductVersion
+        fields = (
            "id",
            "display",
            "url",
            "name",
-            "description",
-            "type",
-            "stored_location",
-            "start_date",
-            "expiration_date",
+            "release_date",
+            "documentation_url",
+            "end_of_support",
+            "filename",
+            "file_checksum",
+            "file_link",
+            "release_type",
            "software_product",
-            "version",
-            "installation",
            "tags",
+            "comments",
            "custom_field_data",
            "created",
            "last_updated",
-        ]
+        )
+        brief_fields = ("id", "display", "url", "name")

    def get_display(self, obj):
        return f"{obj}"
@@ -15,7 +15,12 @@ class SoftwareProductFilterSet(NetBoxModelFilterSet):
        """Perform the filtered search."""
        if not value.strip():
            return queryset
-        qs_filter = Q(name__icontains=value) | Q(manufacturer__name__icontains=value)
+        qs_filter = (
+            Q(name__icontains=value)
+            | Q(description__icontains=value)
+            | Q(manufacturer__name__icontains=value)
+            | Q(comments__icontains=value)
+        )
        return queryset.filter(qs_filter)


@@ -34,6 +39,7 @@ class SoftwareProductVersionFilterSet(NetBoxModelFilterSet):
            Q(name__icontains=value)
            | Q(software_product__name__icontains=value)
            | Q(software_product__manufacturer__name__icontains=value)
+            | Q(comments__icontains=value)
        )
        return queryset.filter(qs_filter)

@@ -53,6 +59,7 @@ class SoftwareProductInstallationFilterSet(NetBoxModelFilterSet):
            Q(software_product__name__icontains=value)
            | Q(software_product__manufacturer__name__icontains=value)
            | Q(version__name__icontains=value)
+            | Q(comments__icontains=value)
        )
        return queryset.filter(qs_filter)

@@ -75,5 +82,6 @@ class SoftwareLicenseFilterSet(NetBoxModelFilterSet):
            | Q(installation__device__name__icontains=value)
            | Q(installation__virtualmachine__name__icontains=value)
            | Q(installation__cluster__name__icontains=value)
+            | Q(comments__icontains=value)
        )
        return queryset.filter(qs_filter)
@@ -1,24 +1,4 @@
-from .software_license import (
-    SoftwareLicenseForm,
-    SoftwareLicenseFilterForm,
-    SoftwareLicenseImportForm,
-    SoftwareLicenseBulkEditForm,
-)
-from .software_product import (
-    SoftwareProductForm,
-    SoftwareProductFilterForm,
-    SoftwareProductImportForm,
-    SoftwareProductBulkEditForm,
-)
-from .software_product_installation import (
-    SoftwareProductInstallationForm,
-    SoftwareProductInstallationFilterForm,
-    SoftwareProductInstallationImportForm,
-    SoftwareProductInstallationBulkEditForm,
-)
-from .software_product_version import (
-    SoftwareProductVersionForm,
-    SoftwareProductVersionFilterForm,
-    SoftwareProductVersionImportForm,
-    SoftwareProductVersionBulkEditForm,
-)
+from .software_license import SoftwareLicenseForm, SoftwareLicenseFilterForm
+from .software_product import SoftwareProductForm, SoftwareProductFilterForm
+from .software_product_installation import SoftwareProductInstallationForm, SoftwareProductInstallationFilterForm
+from .software_product_version import SoftwareProductVersionForm, SoftwareProductVersionFilterForm
@@ -1,16 +1,18 @@
 from django.forms import DateField
 from django.urls import reverse_lazy
-from django.utils.translation import gettext_lazy as _

-from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm
 from netbox_slm.models import SoftwareProduct, SoftwareProductVersion, SoftwareProductInstallation, SoftwareLicense
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField, LaxURLField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField, LaxURLField
+from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import APISelect, DatePicker


 class SoftwareLicenseForm(NetBoxModelForm):
    """Form for creating a new SoftwareLicense object."""

+    comments = CommentField()
+
    stored_location_url = LaxURLField(required=False)

    software_product = DynamicModelChoiceField(
@@ -36,8 +38,8 @@ class SoftwareLicenseForm(NetBoxModelForm):
            "software_product": "$software_product",
        },
    )
-    start_date = DateField(label=_("Start date"), required=False, widget=DatePicker())
-    expiration_date = DateField(label=_("Expiration date"), required=False, widget=DatePicker())
+    start_date = DateField(required=False, widget=DatePicker())
+    expiration_date = DateField(required=False, widget=DatePicker())

    class Meta:
        model = SoftwareLicense
@@ -49,54 +51,17 @@ class SoftwareLicenseForm(NetBoxModelForm):
            "stored_location_url",
            "start_date",
            "expiration_date",
+            "support",
+            "license_amount",
            "software_product",
            "version",
            "installation",
            "tags",
+            "comments",
        )


 class SoftwareLicenseFilterForm(NetBoxModelFilterSetForm):
    model = SoftwareLicense
-    fieldsets = (
-        (
-            None,
-            (
-                "q",
-                "tag",
-            ),
-        ),
-    )
-
+    fieldsets = (FieldSet(None, ("q", "tag")),)
    tag = TagFilterField(model)
-
-
-class SoftwareLicenseImportForm(NetBoxModelImportForm):
-    class Meta:
-        model = SoftwareLicense
-        fields = (
-            "name",
-            "description",
-            "type",
-            "stored_location",
-            "stored_location_url",
-            "start_date",
-            "expiration_date",
-        )
-
-
-class SoftwareLicenseBulkEditForm(NetBoxModelBulkEditForm):
-    software_product = DynamicModelChoiceField(queryset=SoftwareProduct.objects.all(), required=False)
-    version = DynamicModelChoiceField(queryset=SoftwareProductVersion.objects.all(), required=False)
-    installation = DynamicModelChoiceField(queryset=SoftwareProductInstallation.objects.all(), required=False)
-    model = SoftwareLicense
-    fieldsets = (
-        (
-            None,
-            (
-                "software_product",
-                "version",
-                "installation",
-            ),
-        ),
-    )
@@ -1,14 +1,15 @@
-from django import forms
-
 from dcim.models import Manufacturer
-from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm
 from netbox_slm.models import SoftwareProduct
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
+from utilities.forms.rendering import FieldSet


 class SoftwareProductForm(NetBoxModelForm):
    """Form for creating a new SoftwareProduct object."""

+    comments = CommentField()
+
    manufacturer = DynamicModelChoiceField(
        queryset=Manufacturer.objects.all(),
        required=True,
@@ -16,31 +17,16 @@ class SoftwareProductForm(NetBoxModelForm):

    class Meta:
        model = SoftwareProduct
-        fields = ("name", "manufacturer", "description", "tags")
+        fields = (
+            "name",
+            "description",
+            "manufacturer",
+            "tags",
+            "comments",
+        )


 class SoftwareProductFilterForm(NetBoxModelFilterSetForm):
    model = SoftwareProduct
-    fieldsets = ((None, ("q", "tag")),)
-
+    fieldsets = (FieldSet(None, ("q", "tag")),)
    tag = TagFilterField(model)
-
-
-class SoftwareProductImportForm(NetBoxModelImportForm):
-    class Meta:
-        model = SoftwareProduct
-        fields = (
-            "name",
-            "manufacturer",
-        )
-
-
-class SoftwareProductBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=SoftwareProduct.objects.all(),
-        widget=forms.MultipleHiddenInput(),
-    )
-
-    class Meta:
-        model = SoftwareProduct
-        nullable_fields = []
@@ -1,11 +1,11 @@
-from django import forms
+from django.forms import ValidationError
 from django.urls import reverse_lazy
-from django.utils.translation import gettext as _

 from dcim.models import Device
-from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm
 from netbox_slm.models import SoftwareProductInstallation, SoftwareProduct, SoftwareProductVersion
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
+from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import APISelect
 from virtualization.models import VirtualMachine, Cluster

@@ -13,6 +13,8 @@ from virtualization.models import VirtualMachine, Cluster
 class SoftwareProductInstallationForm(NetBoxModelForm):
    """Form for creating a new SoftwareProductInstallation object."""

+    comments = CommentField()
+
    device = DynamicModelChoiceField(queryset=Device.objects.all(), required=False)
    virtualmachine = DynamicModelChoiceField(queryset=VirtualMachine.objects.all(), required=False)
    cluster = DynamicModelChoiceField(queryset=Cluster.objects.all(), required=False)
@@ -32,52 +34,28 @@ class SoftwareProductInstallationForm(NetBoxModelForm):

    class Meta:
        model = SoftwareProductInstallation
-        fields = ("device", "virtualmachine", "cluster", "software_product", "version", "tags")
+        fields = (
+            "device",
+            "virtualmachine",
+            "cluster",
+            "software_product",
+            "version",
+            "tags",
+            "comments",
+        )

    def clean_version(self):
        version = self.cleaned_data["version"]
        software_product = self.cleaned_data["software_product"]
        if version not in software_product.softwareproductversion_set.all():
-            raise forms.ValidationError(
-                _(
-                    f"Version `{version}` doesn't exist on {software_product}, make sure you've "
-                    f"selected a compatible version or first select the software product."
-                )
+            raise ValidationError(
+                f"Version '{version}' doesn't exist on {software_product}, make sure you've "
+                f"selected a compatible version or first select the software product."
            )
        return version


 class SoftwareProductInstallationFilterForm(NetBoxModelFilterSetForm):
    model = SoftwareProductInstallation
-    fieldsets = (
-        (
-            None,
-            (
-                "q",
-                "tag",
-            ),
-        ),
-    )
-
+    fieldsets = (FieldSet(None, ("q", "tag")),)
    tag = TagFilterField(model)
-
-
-class SoftwareProductInstallationImportForm(NetBoxModelImportForm):
-    class Meta:
-        model = SoftwareProductInstallation
-        fields = tuple()
-
-
-class SoftwareProductInstallationBulkEditForm(NetBoxModelBulkEditForm):
-    software_product = DynamicModelChoiceField(queryset=SoftwareProduct.objects.all(), required=False)
-    version = DynamicModelChoiceField(queryset=SoftwareProductVersion.objects.all(), required=False)
-    model = SoftwareProductInstallation
-    fieldsets = (
-        (
-            None,
-            (
-                "software_product",
-                "version",
-            ),
-        ),
-    )
@@ -1,17 +1,20 @@
-from django import forms
+from django.forms import DateField
 from django.urls import reverse_lazy
-from django.utils.translation import gettext as _

-from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
+from netbox.forms import NetBoxModelForm, NetBoxModelFilterSetForm
 from netbox_slm.models import SoftwareProduct, SoftwareProductVersion
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
-from utilities.forms.widgets import APISelect
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
+from utilities.forms.rendering import FieldSet
+from utilities.forms.widgets import APISelect, DatePicker


 class SoftwareProductVersionForm(NetBoxModelForm):
    """Form for creating a new SoftwareProductVersion object."""

-    name = forms.CharField(label=_("Version"))
+    comments = CommentField()
+
+    release_date = DateField(required=False, widget=DatePicker())
+    end_of_support = DateField(required=False, widget=DatePicker())

    software_product = DynamicModelChoiceField(
        queryset=SoftwareProduct.objects.all(),
@@ -20,28 +23,22 @@ class SoftwareProductVersionForm(NetBoxModelForm):

    class Meta:
        model = SoftwareProductVersion
-        fields = ("name", "software_product", "tags")
+        fields = (
+            "name",
+            "release_date",
+            "documentation_url",
+            "end_of_support",
+            "filename",
+            "file_checksum",
+            "file_link",
+            "release_type",
+            "software_product",
+            "tags",
+            "comments",
+        )


 class SoftwareProductVersionFilterForm(NetBoxModelFilterSetForm):
    model = SoftwareProductVersion
-    fieldsets = ((None, ("q", "tag")),)
-
+    fieldsets = (FieldSet(None, ("q", "tag")),)
    tag = TagFilterField(model)
-
-
-class SoftwareProductVersionImportForm(NetBoxModelImportForm):
-    class Meta:
-        model = SoftwareProductVersion
-        fields = ("name",)
-
-
-class SoftwareProductVersionBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=SoftwareProduct.objects.all(),
-        widget=forms.MultipleHiddenInput(),
-    )
-
-    class Meta:
-        model = SoftwareProductVersion
-        nullable_fields = []
@@ -0,0 +1,79 @@
+# Generated by Django 4.2.9 on 2024-02-07 21:01
+
+from django.db import migrations, models
+import netbox_slm.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_slm', '0007_softwareproductinstallation_cluster'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='softwarelicense',
+            name='comments',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='softwarelicense',
+            name='license_amount',
+            field=models.PositiveIntegerField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwarelicense',
+            name='support',
+            field=models.BooleanField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproduct',
+            name='comments',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductinstallation',
+            name='comments',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='comments',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='documentation_url',
+            field=netbox_slm.models.LaxURLField(blank=True, max_length=1024, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='end_of_support',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='file_checksum',
+            field=models.CharField(blank=True, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='file_link',
+            field=netbox_slm.models.LaxURLField(blank=True, max_length=1024, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='filename',
+            field=models.CharField(blank=True, max_length=64, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='release_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='softwareproductversion',
+            name='release_type',
+            field=models.CharField(default='S', max_length=3),
+        ),
+    ]
@@ -18,8 +18,9 @@ class LaxURLField(models.URLField):

 class SoftwareProduct(NetBoxModel):
    name = models.CharField(max_length=128)
-    description = models.CharField(max_length=255, null=True, blank=True)
+    comments = models.TextField(blank=True)

+    description = models.CharField(max_length=255, null=True, blank=True)
    manufacturer = models.ForeignKey(to="dcim.Manufacturer", on_delete=models.PROTECT, null=True, blank=True)

    objects = RestrictedQuerySet.as_manager()
@@ -44,8 +45,29 @@ class SoftwareProduct(NetBoxModel):
        )


+class SoftwareReleaseTypes(models.TextChoices):
+    ALPHA = "A", "Alpha"
+    BETA = "B", "Beta"
+    RELEASE_CANDIDATE = "RC", "Release candidate"
+    STABLE = "S", "Stable release"
+
+
 class SoftwareProductVersion(NetBoxModel):
    name = models.CharField(max_length=64)
+    comments = models.TextField(blank=True)
+
+    release_date = models.DateField(null=True, blank=True)
+    documentation_url = LaxURLField(max_length=1024, null=True, blank=True)
+    end_of_support = models.DateField(null=True, blank=True)
+    filename = models.CharField(max_length=64, null=True, blank=True)
+    file_checksum = models.CharField(max_length=128, null=True, blank=True)
+    file_link = LaxURLField(max_length=1024, null=True, blank=True)
+
+    release_type = models.CharField(
+        max_length=3,
+        choices=SoftwareReleaseTypes.choices,
+        default=SoftwareReleaseTypes.STABLE,
+    )

    software_product = models.ForeignKey(
        to="netbox_slm.SoftwareProduct",
@@ -75,6 +97,8 @@ class SoftwareProductVersion(NetBoxModel):


 class SoftwareProductInstallation(NetBoxModel):
+    comments = models.TextField(blank=True)
+
    device = models.ForeignKey(to="dcim.Device", on_delete=models.PROTECT, null=True, blank=True)
    virtualmachine = models.ForeignKey(
        to="virtualization.VirtualMachine", on_delete=models.PROTECT, null=True, blank=True
@@ -118,13 +142,16 @@ class SoftwareProductInstallation(NetBoxModel):

 class SoftwareLicense(NetBoxModel):
    name = models.CharField(max_length=128)
+    comments = models.TextField(blank=True)
+
    description = models.CharField(max_length=255, null=True, blank=True)
    type = models.CharField(max_length=128)
-
    stored_location = models.CharField(max_length=255, null=True, blank=True)
    stored_location_url = LaxURLField(max_length=1024, null=True, blank=True)
    start_date = models.DateField(null=True, blank=True)
    expiration_date = models.DateField(null=True, blank=True)
+    support = models.BooleanField(default=None, null=True, blank=True)
+    license_amount = models.PositiveIntegerField(default=None, null=True, blank=True)

    software_product = models.ForeignKey(to="netbox_slm.SoftwareProduct", on_delete=models.PROTECT)
    version = models.ForeignKey(to="netbox_slm.SoftwareProductVersion", on_delete=models.PROTECT, null=True, blank=True)
@@ -1,23 +1,15 @@
-from extras.plugins import PluginMenuButton, PluginMenuItem
-from utilities.choices import ButtonColorChoices
+from netbox.plugins import PluginMenuButton, PluginMenuItem

 menu_items = (
    PluginMenuItem(
        link="plugins:netbox_slm:softwareproduct_list",
        link_text="Software Products",
+        permissions=["netbox_slm.add_softwareproduct"],
        buttons=(
            PluginMenuButton(
                "plugins:netbox_slm:softwareproduct_add",
                "Add",
                "mdi mdi-plus-thick",
-                ButtonColorChoices.GREEN,
-                permissions=["netbox_slm.add_softwareproduct"],
-            ),
-            PluginMenuButton(
-                "plugins:netbox_slm:softwareproduct_import",
-                "Import",
-                "mdi mdi-upload",
-                ButtonColorChoices.CYAN,
                permissions=["netbox_slm.add_softwareproduct"],
            ),
        ),
@@ -25,19 +17,12 @@ menu_items = (
    PluginMenuItem(
        link="plugins:netbox_slm:softwareproductversion_list",
        link_text="Versions",
+        permissions=["netbox_slm.add_softwareproductversion"],
        buttons=(
            PluginMenuButton(
                "plugins:netbox_slm:softwareproductversion_add",
                "Add",
                "mdi mdi-plus-thick",
-                ButtonColorChoices.GREEN,
-                permissions=["netbox_slm.add_softwareproductversion"],
-            ),
-            PluginMenuButton(
-                "plugins:netbox_slm:softwareproductversion_import",
-                "Import",
-                "mdi mdi-upload",
-                ButtonColorChoices.CYAN,
                permissions=["netbox_slm.add_softwareproductversion"],
            ),
        ),
@@ -45,19 +30,12 @@ menu_items = (
    PluginMenuItem(
        link="plugins:netbox_slm:softwareproductinstallation_list",
        link_text="Installations",
+        permissions=["netbox_slm.add_softwareproductinstallation"],
        buttons=(
            PluginMenuButton(
                "plugins:netbox_slm:softwareproductinstallation_add",
                "Add",
                "mdi mdi-plus-thick",
-                ButtonColorChoices.GREEN,
-                permissions=["netbox_slm.add_softwareproductinstallation"],
-            ),
-            PluginMenuButton(
-                "plugins:netbox_slm:softwareproductinstallation_import",
-                "Import",
-                "mdi mdi-upload",
-                ButtonColorChoices.CYAN,
                permissions=["netbox_slm.add_softwareproductinstallation"],
            ),
        ),
@@ -65,19 +43,12 @@ menu_items = (
    PluginMenuItem(
        link="plugins:netbox_slm:softwarelicense_list",
        link_text="Licenses",
+        permissions=["netbox_slm.add_softwarelicense"],
        buttons=(
            PluginMenuButton(
                "plugins:netbox_slm:softwarelicense_add",
                "Add",
                "mdi mdi-plus-thick",
-                ButtonColorChoices.GREEN,
-                permissions=["netbox_slm.add_softwarelicense"],
-            ),
-            PluginMenuButton(
-                "plugins:netbox_slm:softwarelicense_import",
-                "Import",
-                "mdi mdi-upload",
-                ButtonColorChoices.CYAN,
                permissions=["netbox_slm.add_softwarelicense"],
            ),
        ),
@@ -11,7 +11,7 @@ class SoftwareProductTable(NetBoxTable):
    pk = ToggleColumn()
    name = tables.LinkColumn()
    manufacturer = tables.Column(accessor="manufacturer", linkify=True)
-    installations = tables.Column(accessor="get_installation_count", verbose_name="Installations")
+    installations = tables.Column(accessor="get_installation_count")

    tags = columns.TagColumn(url_name="plugins:netbox_slm:softwareproduct_list")

@@ -51,10 +51,10 @@ class SoftwareProductVersionTable(NetBoxTable):
    """Table for displaying SoftwareProductVersion objects."""

    pk = ToggleColumn()
-    name = tables.LinkColumn(verbose_name="Version")
+    name = tables.LinkColumn()
    software_product = tables.Column(accessor="software_product", linkify=True)
    manufacturer = tables.Column(accessor="software_product__manufacturer", linkify=True)
-    installations = tables.Column(accessor="get_installation_count", verbose_name="Installations")
+    installations = tables.Column(accessor="get_installation_count")

    tags = columns.TagColumn(url_name="plugins:netbox_slm:softwareproductversion_list")

@@ -65,6 +65,9 @@ class SoftwareProductVersionTable(NetBoxTable):
            "name",
            "software_product",
            "manufacturer",
+            "release_date",
+            "end_of_support",
+            "release_type",
            "installations",
            "tags",
        )
@@ -73,6 +76,7 @@ class SoftwareProductVersionTable(NetBoxTable):
            "name",
            "software_product",
            "manufacturer",
+            "release_date",
            "installations",
            "tags",
        )
@@ -172,6 +176,8 @@ class SoftwareLicenseTable(NetBoxTable):
            "software_product",
            "version",
            "installation",
+            "support",
+            "license_amount",
            "tags",
        )
        default_columns = (
@@ -11,53 +11,60 @@
            <h5 class="card-header">
                Software License
            </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">Name</th>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Description</th>
-                        <td>{{ object.description }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Type</th>
-                        <td>{{ object.type }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Stored location</th>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">Name</th>
+                    <td>{{ object.name }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Description</th>
+                    <td>{{ object.description }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Type</th>
+                    <td>{{ object.type }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Stored location</th>
 {% if object.stored_location_url %}
-                        <td><a href="{{ object.stored_location_url }}">{{ object.stored_location_txt }}</a></td>
+                    <td><a href="{{ object.stored_location_url }}">{{ object.stored_location_txt }}</a></td>
 {% else %}
-                        <td>{{ object.stored_location_txt }}</td>
+                    <td>{{ object.stored_location_txt }}</td>
 {% endif %}
-                    </tr>
-                    <tr>
-                        <th scope="row">Start date</th>
-                        <td>{{ object.start_date }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Expiration date</th>
-                        <td>{{ object.expiration_date }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Software Product</th>
-                        <td>{{ object.software_product }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Version</th>
-                        <td>{{ object.version }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Installation</th>
-                        <td>{{ object.installation }}</td>
-                    </tr>
-                </table>
-            </div>
+                </tr>
+                <tr>
+                    <th scope="row">Start date</th>
+                    <td>{{ object.start_date }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Expiration date</th>
+                    <td>{{ object.expiration_date }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Software Product</th>
+                    <td>{{ object.software_product }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Version</th>
+                    <td>{{ object.version }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Support</th>
+                    <td>{{ object.support }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">License amount</th>
+                    <td>{{ object.license_amount }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Installation</th>
+                    <td>{{ object.installation }}</td>
+                </tr>
+            </table>
        </div>
        {% include 'inc/panels/custom_fields.html' %}
        {% include 'inc/panels/tags.html' %}
+        {% include 'inc/panels/comments.html' %}
        {% plugin_left_page object %}
    </div>
 </div>
@@ -11,37 +11,36 @@
            <h5 class="card-header">
                Software Product
            </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">Name</th>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Description</th>
-                        <td>{{ object.description }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Manufacturer</th>
-                        <td>{{ object.manufacturer }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Versions</th>
-                        <td>
-                        {% for version in object.softwareproduct_versions.all %}
-                            <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>
-                </table>
-            </div>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">Name</th>
+                    <td>{{ object.name }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Description</th>
+                    <td>{{ object.description }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Manufacturer</th>
+                    <td>{{ object.manufacturer }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Versions</th>
+                    <td>
+                    {% for version in object.softwareproduct_versions.all %}
+                        <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>
+            </table>
        </div>
        {% include 'inc/panels/custom_fields.html' %}
        {% include 'inc/panels/tags.html' %}
+        {% include 'inc/panels/comments.html' %}
        {% plugin_left_page object %}
    </div>
 </div>
@@ -11,37 +11,36 @@
            <h5 class="card-header">
                Software Product Installation
            </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
+            <table class="table table-hover attr-table">
 {% if object.device %}
-                    <tr>
-                        <th scope="row">Device</th>
-                        <td>{{ object.device }}</td>
-                    </tr>
+                <tr>
+                    <th scope="row">Device</th>
+                    <td>{{ object.device }}</td>
+                </tr>
 {% elif object.virtualmachine %}
-                    <tr>
-                        <th scope="row">Virtualmachine</th>
-                        <td>{{ object.virtualmachine }}</td>
-                    </tr>
+                <tr>
+                    <th scope="row">Virtualmachine</th>
+                    <td>{{ object.virtualmachine }}</td>
+                </tr>
 {% else %}
-                    <tr>
-                        <th scope="row">Cluster</th>
-                        <td>{{ object.cluster }}</td>
-                    </tr>
+                <tr>
+                    <th scope="row">Cluster</th>
+                    <td>{{ object.cluster }}</td>
+                </tr>
 {% endif %}
-                    <tr>
-                        <th scope="row">Software Product</th>
-                        <td>{{ object.software_product }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Version</th>
-                        <td>{{ object.version }}</td>
-                    </tr>
-                </table>
-            </div>
+                <tr>
+                    <th scope="row">Software Product</th>
+                    <td>{{ object.software_product }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Version</th>
+                    <td>{{ object.version }}</td>
+                </tr>
+            </table>
        </div>
        {% include 'inc/panels/custom_fields.html' %}
        {% include 'inc/panels/tags.html' %}
+        {% include 'inc/panels/comments.html' %}
        {% plugin_left_page object %}
    </div>
 </div>
@@ -11,23 +11,52 @@
            <h5 class="card-header">
                Software Product Version
            </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">Name</th>
-                        <td>{{ object.name }}</td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Installations</th>
-                        <td>
-                            {{ object.get_installation_count }}
-                        </td>
-                    </tr>
-                </table>
-            </div>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">Name</th>
+                    <td>{{ object.name }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Release date</th>
+                    <td>{{ object.release_date }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Documentation url</th>
+{% if object.documentation_url %}
+                    <td><a href="{{ object.documentation_url }}">{{ object.documentation_url }}</a></td>
+{% else %}
+                    <td>{{ object.documentation_url }}</td>
+{% endif %}
+                </tr>
+                <tr>
+                    <th scope="row">End of support</th>
+                    <td>{{ object.end_of_support }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Filename</th>
+{% if object.file_link %}
+                    <td><a href="{{ object.file_link }}">{{ object.filename }}</a></td>
+{% else %}
+                    <td>{{ object.filename }}</td>
+{% endif %}
+                </tr>
+                <tr>
+                    <th scope="row">File checksum</th>
+                    <td>{{ object.file_checksum }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Release type</th>
+                    <td>{{ object.get_release_type_display }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">Installations</th>
+                    <td>{{ object.get_installation_count }}</td>
+                </tr>
+            </table>
        </div>
        {% include 'inc/panels/custom_fields.html' %}
        {% include 'inc/panels/tags.html' %}
+        {% include 'inc/panels/comments.html' %}
        {% plugin_left_page object %}
    </div>
 </div>
@@ -8,8 +8,6 @@ urlpatterns = [
    # SoftwareProduct
    path("software-products/", views.SoftwareProductListView.as_view(), name="softwareproduct_list"),
    path("software-products/add/", views.SoftwareProductEditView.as_view(), name="softwareproduct_add"),
-    path("software-products/import/", views.SoftwareProductBulkImportView.as_view(), name="softwareproduct_import"),
-    path("software-products/edit/", views.SoftwareProductBulkEditView.as_view(), name="softwareproduct_bulk_edit"),
    path(
        "software-products/delete/", views.SoftwareProductBulkDeleteView.as_view(), name="softwareproduct_bulk_delete"
    ),
@@ -27,10 +25,6 @@ urlpatterns = [
    # SoftwareProductVersion
    path("versions/", views.SoftwareProductVersionListView.as_view(), name="softwareproductversion_list"),
    path("versions/add/", views.SoftwareProductVersionEditView.as_view(), name="softwareproductversion_add"),
-    path(
-        "versions/import/", views.SoftwareProductVersionBulkImportView.as_view(), name="softwareproductversion_import"
-    ),
-    path("versions/edit/", views.SoftwareProductVersionBulkEditView.as_view(), name="softwareproductversion_bulk_edit"),
    path(
        "versions/delete/",
        views.SoftwareProductVersionBulkDeleteView.as_view(),
@@ -60,16 +54,6 @@ urlpatterns = [
        views.SoftwareProductInstallationEditView.as_view(),
        name="softwareproductinstallation_add",
    ),
-    path(
-        "installations/import/",
-        views.SoftwareProductInstallationBulkImportView.as_view(),
-        name="softwareproductinstallation_import",
-    ),
-    path(
-        "installations/edit/",
-        views.SoftwareProductInstallationBulkEditView.as_view(),
-        name="softwareproductinstallation_bulk_edit",
-    ),
    path(
        "installations/delete/",
        views.SoftwareProductInstallationBulkDeleteView.as_view(),
@@ -99,8 +83,6 @@ urlpatterns = [
    # SoftwareLicense
    path("licenses/", views.SoftwareLicenseListView.as_view(), name="softwarelicense_list"),
    path("licenses/add/", views.SoftwareLicenseEditView.as_view(), name="softwarelicense_add"),
-    path("licenses/import/", views.SoftwareLicenseBulkImportView.as_view(), name="softwarelicense_import"),
-    path("licenses/edit/", views.SoftwareLicenseBulkEditView.as_view(), name="softwarelicense_bulk_edit"),
    path("licenses/delete/", views.SoftwareLicenseBulkDeleteView.as_view(), name="softwarelicense_bulk_delete"),
    path("licenses/<int:pk>/", views.SoftwareLicenseView.as_view(), name="softwarelicense"),
    path("licenses/<int:pk>/delete/", views.SoftwareLicenseDeleteView.as_view(), name="softwarelicense_delete"),
@@ -3,8 +3,6 @@ from .software_license import (
    SoftwareLicenseView,
    SoftwareLicenseEditView,
    SoftwareLicenseDeleteView,
-    SoftwareLicenseBulkImportView,
-    SoftwareLicenseBulkEditView,
    SoftwareLicenseBulkDeleteView,
 )
 from .software_product import (
@@ -12,8 +10,6 @@ from .software_product import (
    SoftwareProductView,
    SoftwareProductEditView,
    SoftwareProductDeleteView,
-    SoftwareProductBulkImportView,
-    SoftwareProductBulkEditView,
    SoftwareProductBulkDeleteView,
 )
 from .software_product_installation import (
@@ -21,8 +17,6 @@ from .software_product_installation import (
    SoftwareProductInstallationView,
    SoftwareProductInstallationEditView,
    SoftwareProductInstallationDeleteView,
-    SoftwareProductInstallationBulkImportView,
-    SoftwareProductInstallationBulkEditView,
    SoftwareProductInstallationBulkDeleteView,
 )
 from .software_product_version import (
@@ -30,7 +24,5 @@ from .software_product_version import (
    SoftwareProductVersionView,
    SoftwareProductVersionEditView,
    SoftwareProductVersionDeleteView,
-    SoftwareProductVersionBulkImportView,
-    SoftwareProductVersionBulkEditView,
    SoftwareProductVersionBulkDeleteView,
 )
@@ -31,19 +31,6 @@ class SoftwareLicenseDeleteView(generic.ObjectDeleteView):
    queryset = SoftwareLicense.objects.all()


-class SoftwareLicenseBulkImportView(generic.BulkImportView):
-    queryset = SoftwareLicense.objects.all()
-    model_form = forms.SoftwareLicenseImportForm
-    table = tables.SoftwareLicenseTable
-
-
-class SoftwareLicenseBulkEditView(generic.BulkEditView):
-    queryset = SoftwareLicense.objects.all()
-    filterset = filtersets.SoftwareLicenseFilterSet
-    table = tables.SoftwareLicenseTable
-    form = forms.SoftwareLicenseBulkEditForm
-
-
 class SoftwareLicenseBulkDeleteView(generic.BulkDeleteView):
    queryset = SoftwareLicense.objects.all()
    table = tables.SoftwareLicenseTable
@@ -35,20 +35,6 @@ class SoftwareProductDeleteView(generic.ObjectDeleteView):
    queryset = SoftwareProduct.objects.all()


-class SoftwareProductBulkImportView(generic.BulkImportView):
-    queryset = SoftwareProduct.objects.all()
-    model_form = forms.SoftwareProductImportForm
-    table = tables.SoftwareProductTable
-
-
-class SoftwareProductBulkEditView(generic.BulkEditView):
-    queryset = SoftwareProduct.objects.all()
-    filterset = filtersets.SoftwareProductFilterSet
-    filterset_form = forms.SoftwareProductFilterForm
-    table = tables.SoftwareProductTable
-    form = forms.SoftwareProductBulkEditForm
-
-
 class SoftwareProductBulkDeleteView(generic.BulkDeleteView):
    queryset = SoftwareProduct.objects.all()
    table = tables.SoftwareProductTable
@@ -31,19 +31,6 @@ class SoftwareProductInstallationDeleteView(generic.ObjectDeleteView):
    queryset = SoftwareProductInstallation.objects.all()


-class SoftwareProductInstallationBulkImportView(generic.BulkImportView):
-    queryset = SoftwareProductInstallation.objects.all()
-    model_form = forms.SoftwareProductInstallationImportForm
-    table = tables.SoftwareProductInstallationTable
-
-
-class SoftwareProductInstallationBulkEditView(generic.BulkEditView):
-    queryset = SoftwareProductInstallation.objects.all()
-    filterset = filtersets.SoftwareProductInstallationFilterSet
-    table = tables.SoftwareProductInstallationTable
-    form = forms.SoftwareProductInstallationBulkEditForm
-
-
 class SoftwareProductInstallationBulkDeleteView(generic.BulkDeleteView):
    queryset = SoftwareProductInstallation.objects.all()
    table = tables.SoftwareProductInstallationTable
@@ -35,19 +35,6 @@ class SoftwareProductVersionDeleteView(generic.ObjectDeleteView):
    queryset = SoftwareProductVersion.objects.all()


-class SoftwareProductVersionBulkImportView(generic.BulkImportView):
-    queryset = SoftwareProductVersion.objects.all()
-    model_form = forms.SoftwareProductVersionImportForm
-    table = tables.SoftwareProductVersionTable
-
-
-class SoftwareProductVersionBulkEditView(generic.BulkEditView):
-    queryset = SoftwareProductVersion.objects.all()
-    filterset = filtersets.SoftwareProductVersionFilterSet
-    table = tables.SoftwareProductVersionTable
-    form = forms.SoftwareProductVersionBulkEditForm
-
-
 class SoftwareProductVersionBulkDeleteView(generic.BulkDeleteView):
    queryset = SoftwareProductVersion.objects.all()
    table = tables.SoftwareProductVersionTable
@@ -7,7 +7,7 @@ name = "netbox-slm"
 dynamic = ["version"]
 description = "Software Lifecycle Management Netbox Plugin"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = { text = "Apache-2.0" }
 authors = [
    {name = "ICTU", email = "open-source-projects@ictu.nl"},
@@ -21,9 +21,8 @@ classifiers = [
    "Programming Language :: Python",
    "Programming Language :: Python :: 3",
    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
    "Topic :: Internet :: WWW/HTTP",
    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
@@ -31,13 +30,12 @@ dependencies = []

 [project.optional-dependencies]
 build = [
-    "build == 1.0.3",
-    "setuptools == 68.2.0",
-    "twine == 3.7.1",
+    "build == 1.2.1",
+    "setuptools == 70.3.0",
+    "twine == 5.1.1",
 ]
 tools = [
-    "black == 23.3.0",
-    "ruff == 0.0.275",
+    "ruff == 0.5.1",
 ]

 [tool.setuptools.dynamic]
@@ -46,24 +44,12 @@ version = {attr = "netbox_slm.__version__"}
 [tool.setuptools.packages.find]
 include = ["netbox_slm"]

-[tool.black]
-line-length = 120
-target-version = ["py39"]
-color = true
-check = true
-diff = true
-fast = true
-extend-exclude = '''
-netbox_slm/migrations/.*.py
-'''
-
 [tool.ruff]
 line-length = 120
-target-version = "py39"
-format = "github"
+target-version = "py311"
 src = ["netbox_slm"]

-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = [
    "D104",  # https://beta.ruff.rs/docs/rules/#pydocstyle-d - don't require doc strings in __init__.py files
    "F401",  # https://beta.ruff.rs/docs/rules/#pyflakes-f - don't complain about unused imports in __init__.py files
@@ -71,3 +57,6 @@ src = ["netbox_slm"]
 "netbox_slm/migrations/*.py" = [
    "E501",  # https://beta.ruff.rs/docs/rules/line-too-long/ - don't check on Django generated migration files
 ]
+
+[tool.ruff.format]
+exclude = ["netbox_slm/migrations/*.py"]
Author	SHA1	Message	Date
wkoot	72646a6287	Update PluginMenuItem permissions and remove bulk import/edit (#41 ) Closes #37	2024-07-09 23:00:58 +02:00
wkoot	86215f43a6	Prepare for upgrade to NetBox v4.0.6 (#40 ) Closes #38	2024-07-09 22:15:58 +02:00
wkoot	230b3b5115	Add new fields to models and upgrade to NetBox v3.7.2 (#36 ) Closes #10, #26, #35	2024-02-13 12:11:49 +01:00