netbox-docker-plugin 4.12.1__tar.gz → 5.0.1__tar.gz

{netbox_docker_plugin-4.12.1/netbox_docker_plugin.egg-info → netbox_docker_plugin-5.0.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 4.12.1
+Version: 5.0.1
 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.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
@@ -44,7 +44,7 @@ Once the plugin and webhooks are installed, you can:
 4. Manage the container status, start, stop, restart.
 
 
-> [!NOTE]  
+> [!NOTE]
 > Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
 >
 > ```bash
@@ -67,7 +67,8 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
-| >=4.3.7        | >=4.5.1                      |
+| >=4.3.7 <4.5.0 | >=4.5.1 <5.\*                |
+| >=4.5.0        | >=5.\*                       |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/README.md

@@ -30,7 +30,7 @@ Once the plugin and webhooks are installed, you can:
 4. Manage the container status, start, stop, restart.
 
 
-> [!NOTE]  
+> [!NOTE]
 > Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
 >
 > ```bash
@@ -53,7 +53,8 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
-| >=4.3.7        | >=4.5.1                      |
+| >=4.3.7 <4.5.0 | >=4.5.1 <5.\*                |
+| >=4.5.0        | >=5.\*                       |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/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 = "4.12.1"
+    version = "5.0.1"
     base_url = "docker"
-    min_version = "4.3.7"
+    min_version = "4.5.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-4.12.1 → netbox_docker_plugin-5.0.1}/netbox_docker_plugin/api/serializers.py

@@ -32,7 +32,16 @@ class NestedTokenSerializer(WritableNestedSerializer):
         """Nested Token Serializer Meta class"""
 
         model = Token
-        fields = ["id", "url", "display_url", "display", "key", "write_enabled"]
+        fields = [
+            "id",
+            "url",
+            "display_url",
+            "display",
+            "key",
+            "token",
+            "version",
+            "write_enabled",
+        ]
 
 
 class NestedHostSerializer(WritableNestedSerializer):

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/netbox_docker_plugin/models/host.py

@@ -20,12 +20,14 @@ class HostStateChoices(ChoiceSet):
     STATE_CREATED = "created"
     STATE_DELETED = "deleted"
     STATE_RUNNING = "running"
+    STATE_ERROR = "error"
     STATE_REFRESHING = "refreshing"
 
     CHOICES = [
         (STATE_CREATED, "Created", "dark"),
-        (STATE_RUNNING, "Running", "blue"),
         (STATE_DELETED, "Deleted", "blue"),
+        (STATE_RUNNING, "Running", "blue"),
+        (STATE_ERROR, "Error", "red"),
         (STATE_REFRESHING, "Refreshing", "blue"),
     ]
 
@@ -102,9 +104,7 @@ class Host(NetBoxModel):
 
         return super().delete(using, keep_parents)
 
-    def save(
-        self, *args, **kwargs
-    ):
+    def save(self, *args, **kwargs):
         if self.operation == HostOperationChoices.OPERATION_REFRESH:
             self.state = HostStateChoices.STATE_REFRESHING
 

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/netbox_docker_plugin/tests/host/test_host_views.py

@@ -6,13 +6,14 @@ from core.models import ObjectChange
 from django.core.exceptions import ObjectDoesNotExist
 from users.models import ObjectPermission
 from utilities.testing import ViewTestCases, post_data
-from netbox_docker_plugin.models.host import Host
+from netbox_docker_plugin.models.host import Host, HostStateChoices
 from ..base import BaseModelViewTestCase
 
 
 class HostViewsTestCase(BaseModelViewTestCase, ViewTestCases.PrimaryObjectViewTestCase):
     """Host Views Test Case Class"""
 
+    objects = {}
     model = Host
     form_data = {
         "name": "host4",
@@ -86,6 +87,14 @@ class HostViewsTestCase(BaseModelViewTestCase, ViewTestCases.PrimaryObjectViewTe
         self.assertHttpStatus(response, 302)
         self.assertFalse(self._get_queryset().filter(pk__in=pk_list).exists())
 
+    def test_host_error_state(self):
+        """Test the host error state"""
+
+        self.assertEqual(
+           self.objects["host_error_state"].state,
+            HostStateChoices.STATE_ERROR
+        )
+
     @classmethod
     def setUpTestData(cls):
         host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
@@ -98,3 +107,8 @@ class HostViewsTestCase(BaseModelViewTestCase, ViewTestCases.PrimaryObjectViewTe
             f"{host2.pk},http://localhost:8085",
             f"{host3.pk},http://localhost:8085",
         )
+        cls.objects["host_error_state"] = Host.objects.create(
+            endpoint="http://localhost:8080",
+            name="host_error_state",
+            state=HostStateChoices.STATE_ERROR,
+        )

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/netbox_docker_plugin/utilities/__init__.py

@@ -25,7 +25,7 @@ webhooks = [
         "type_job_start": False,
         "type_job_end": False,
         "http_method": "GET",
-        "payload_url": "{{ data.endpoint }}/api/engine/endpoint?id={{ data.id }}&token={{ data.token.key }}&endpoint={{ data.endpoint }}&url={{ data.netbox_base_url }}",
+        "payload_url": "{{ data.endpoint }}/api/engine/endpoint?id={{ data.id }}&token=nbt_{{ data.token.key }}.{{ data.token.token }}&endpoint={{ data.endpoint }}&url={{ data.netbox_base_url }}",
         "ssl_verification": False,
     },
     {
@@ -235,6 +235,14 @@ def create_webhook(app_config, **kwargs):
                     # pylint: disable=E1101
                     eventrule.object_types.set([obj_content_type.pk])
                     eventrule.save()
+                else:
+                    if (
+                        results[0].http_method != webhook["http_method"]
+                        or results[0].payload_url != webhook["payload_url"]
+                    ):
+                        results[0].http_method = webhook["http_method"]
+                        results[0].payload_url = webhook["payload_url"]
+                        results[0].save()
 
             return
 

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 4.12.1
+Version: 5.0.1
 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.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
@@ -44,7 +44,7 @@ Once the plugin and webhooks are installed, you can:
 4. Manage the container status, start, stop, restart.
 
 
-> [!NOTE]  
+> [!NOTE]
 > Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
 >
 > ```bash
@@ -67,7 +67,8 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
-| >=4.3.7        | >=4.5.1                      |
+| >=4.3.7 <4.5.0 | >=4.5.1 <5.\*                |
+| >=4.5.0        | >=5.\*                       |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.12.1 → netbox_docker_plugin-5.0.1}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-docker-plugin"
-version = "4.12.1"
+version = "5.0.1"
 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.11"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
 ]