netbox-docker-plugin 2.9.0__tar.gz → 3.0.0__tar.gz

{netbox_docker_plugin-2.9.0/netbox_docker_plugin.egg-info → netbox_docker_plugin-3.0.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 2.9.0
+Version: 3.0.0
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin
 Project-URL: Bug Tracker, https://github.com/SaaShup/netbox-docker-plugin/issues
 Keywords: netbox,netbox-plugin,docker
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -40,6 +40,14 @@ Once the plugin and webhooks are installed, you can:
 
 ## Installation
 
+Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chose the right version of the plugin depending of the Netbox version you use:
+
+| Netbox Version | Netbox Docker Plugin Version |
+| -------------- | ---------------------------- |
+| 3.\*           | 1.\*                         |
+| 4.0.\*         | 2.\*                         |
+| 4.1.\*         | 3.\*                         |
+
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).
 

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/README.md

@@ -27,6 +27,14 @@ Once the plugin and webhooks are installed, you can:
 
 ## Installation
 
+Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chose the right version of the plugin depending of the Netbox version you use:
+
+| Netbox Version | Netbox Docker Plugin Version |
+| -------------- | ---------------------------- |
+| 3.\*           | 1.\*                         |
+| 4.0.\*         | 2.\*                         |
+| 4.1.\*         | 3.\*                         |
+
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).
 

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/__init__.py

@@ -11,9 +11,9 @@ class NetBoxDockerConfig(PluginConfig):
     name = "netbox_docker_plugin"
     verbose_name = " NetBox Docker Plugin"
     description = "Manage Docker"
-    version = "2.9.0"
+    version = "3.0.0"
     base_url = "docker"
-    min_version = "4.0.0"
+    min_version = "4.1.0"
     author = "Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>"
     author_email = "vincent@saashup.com, david.jose.delassus@gmail.com"
 

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/api/serializers.py

@@ -4,7 +4,7 @@
 
 from rest_framework import serializers
 from utilities.query import dict_to_filter_params
-from users.api.nested_serializers import NestedTokenSerializer
+from users.models import Token
 from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
 from ..models.host import Host
 from ..models.image import Image
@@ -23,6 +23,15 @@ from ..models.container import (
 from ..models.registry import Registry
 
 
+class NestedTokenSerializer(WritableNestedSerializer):
+    """Nested Token Serializer class"""
+
+    class Meta:
+        """Nested Token Serializer Meta class"""
+        model = Token
+        fields = ["id", "url", "display_url", "display", "key", "write_enabled"]
+
+
 class NestedHostSerializer(WritableNestedSerializer):
     """Nested Host Serializer class"""
 

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/tests/container/test_container_operation_view.py

@@ -4,11 +4,11 @@
 from django.urls import reverse
 from django.test import override_settings
 from core.models import ObjectType
+from core.models import ObjectChange
+from core.choices import ObjectChangeActionChoices
 from utilities.testing import ModelViewTestCase
 from utilities.testing.utils import disable_warnings, post_data
 from users.models import ObjectPermission
-from extras.choices import ObjectChangeActionChoices
-from extras.models import ObjectChange
 from netbox_docker_plugin.models.host import Host
 from netbox_docker_plugin.models.container import Container
 from netbox_docker_plugin.models.image import Image

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/tests/container/test_container_views.py

@@ -66,7 +66,7 @@ class ContainerViewsTestCase(
             "host": host1.pk,
             "image": image1.pk,
             "restart_policy": "unless-stopped",
-            "cap_add": "NET_ADMIN",
+            "cap_add": ["NET_ADMIN"],
         }
 
         cls.csv_data = (

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/tests/host/test_host_api.py

@@ -1,8 +1,8 @@
 """Host API Test Case"""
 
 from core.models import ObjectType
-from extras.choices import ObjectChangeActionChoices
-from extras.models import ObjectChange
+from core.choices import ObjectChangeActionChoices
+from core.models import ObjectChange
 from users.models import ObjectPermission
 from rest_framework import status
 from utilities.testing import APIViewTestCases

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/tests/host/test_host_views.py

@@ -1,9 +1,9 @@
 """Host Views Test Case"""
 
 from core.models import ObjectType
+from core.choices import ObjectChangeActionChoices
+from core.models import ObjectChange
 from django.core.exceptions import ObjectDoesNotExist
-from extras.choices import ObjectChangeActionChoices
-from extras.models import ObjectChange
 from users.models import ObjectPermission
 from utilities.testing import ViewTestCases, post_data
 from netbox_docker_plugin.models.host import Host

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/netbox_docker_plugin/utilities/__init__.py

@@ -202,14 +202,27 @@ def create_webhook(app_config, **kwargs):
                     )
                     obj.save()
 
+                    event_types = []
+
+                    if webhook["type_create"]:
+                        event_types.append("object_created")
+
+                    if webhook["type_update"]:
+                        event_types.append("object_updated")
+
+                    if webhook["type_delete"]:
+                        event_types.append("object_deleted")
+
+                    if webhook["type_job_start"]:
+                        event_types.append("job_started")
+
+                    if webhook["type_job_end"]:
+                        event_types.append("job_completed")
+
                     eventrule = EventRule(
                         name=webhook["name"],
                         description="Added automatically by the Netbox Docker Plugin",
-                        type_create=webhook["type_create"],
-                        type_update=webhook["type_update"],
-                        type_delete=webhook["type_delete"],
-                        type_job_start=webhook["type_job_start"],
-                        type_job_end=webhook["type_job_end"],
+                        event_types=event_types,
                         action_object_id=obj.pk,
                         action_object_type=wh_content_type,
                     )

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 2.9.0
+Version: 3.0.0
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin
 Project-URL: Bug Tracker, https://github.com/SaaShup/netbox-docker-plugin/issues
 Keywords: netbox,netbox-plugin,docker
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -40,6 +40,14 @@ Once the plugin and webhooks are installed, you can:
 
 ## Installation
 
+Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chose the right version of the plugin depending of the Netbox version you use:
+
+| Netbox Version | Netbox Docker Plugin Version |
+| -------------- | ---------------------------- |
+| 3.\*           | 1.\*                         |
+| 4.0.\*         | 2.\*                         |
+| 4.1.\*         | 3.\*                         |
+
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).
 

{netbox_docker_plugin-2.9.0 → netbox_docker_plugin-3.0.0}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-docker-plugin"
-version = "2.9.0"
+version = "3.0.0"
 authors = [
   { name="Vincent Simonin", email="vincent@saashup.com" },
   { name="David Delassus", email="david.jose.delassus@gmail.com" }
 ]
 description = "Manage Docker with Netbox & style."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Python :: 3",
 ]