netbox-docker-plugin 1.6.0__tar.gz → 1.6.2__tar.gz

{netbox_docker_plugin-1.6.0/netbox_docker_plugin.egg-info → netbox_docker_plugin-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 1.6.0
+Version: 1.6.2
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/__init__.py

@@ -10,7 +10,7 @@ class NetBoxDockerConfig(PluginConfig):
     name = "netbox_docker_plugin"
     verbose_name = " NetBox Docker Plugin"
     description = "Manage Docker"
-    version = "1.6.0"
+    version = "1.6.2"
     base_url = "docker"
     author= "Vincent Simonin"
     author_email= "vincent@saashup.com"

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/api/serializers.py

@@ -3,6 +3,7 @@
 # pylint: disable=E1101
 
 from rest_framework import serializers
+from utilities.utils import dict_to_filter_params
 from users.api.nested_serializers import NestedTokenSerializer
 from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer
 from ..models.host import Host
@@ -86,6 +87,20 @@ class NestedVolumeSerializer(WritableNestedSerializer):
             "driver",
         )
 
+    def to_internal_value(self, data):
+        if data is None:
+            return None
+
+        if isinstance(data, dict):
+            params = dict_to_filter_params(data)
+            if Volume.objects.filter(**params).count() == 0:
+                host = Host.objects.get(pk=params["host"])
+                volume = Volume(host= host, name= params["name"])
+                volume.save()
+                return volume
+
+        return super().to_internal_value(data)
+
 
 class NestedNetworkSerializer(WritableNestedSerializer):
     """Nested Network Serializer class"""
@@ -123,6 +138,7 @@ class NestedContainerSerializer(WritableNestedSerializer):
         fields = (
             "id",
             "url",
+            "display",
             "name",
             "ContainerID",
             "state",
@@ -374,6 +390,7 @@ class ContainerSerializer(NetBoxModelSerializer):
         fields = (
             "id",
             "url",
+            "display",
             "host",
             "image",
             "name",

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/tests/container/test_container_api.py

@@ -23,6 +23,7 @@ class ContainerApiTestCase(
     model = Container
     brief_fields = [
         "ContainerID",
+        "display",
         "hostname",
         "id",
         "name",

netbox_docker_plugin-1.6.2/netbox_docker_plugin/tests/volume/test_volume_api.py

@@ -0,0 +1,122 @@
+"""Volume Test Case"""
+
+from django.urls import reverse
+from django.contrib.contenttypes.models import ContentType
+from rest_framework import status
+from users.models import ObjectPermission
+from utilities.testing import APIViewTestCases
+from netbox_docker_plugin.models.host import Host
+from netbox_docker_plugin.models.volume import Volume
+from netbox_docker_plugin.models.image import Image
+from netbox_docker_plugin.models.registry import Registry
+from netbox_docker_plugin.models.container import Container, Mount
+from netbox_docker_plugin.tests.base import BaseAPITestCase
+
+
+class VolumeApiTestCase(
+    BaseAPITestCase,
+    APIViewTestCases.GetObjectViewTestCase,
+    APIViewTestCases.ListObjectsViewTestCase,
+    APIViewTestCases.CreateObjectViewTestCase,
+    APIViewTestCases.UpdateObjectViewTestCase,
+    APIViewTestCases.DeleteObjectViewTestCase,
+):
+    """Volume Test Case Class"""
+
+    model = Volume
+    brief_fields = ["display", "driver", "id", "name", "url"]
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
+        host2 = Host.objects.create(endpoint="http://localhost:8080", name="host2")
+
+        Volume.objects.create(host=host1, name="volume1")
+        Volume.objects.create(host=host1, name="volume2")
+        Volume.objects.create(host=host2, name="volume3")
+
+        cls.create_data = [
+            {
+                "host": host1.pk,
+                "name": "volume4",
+            },
+            {
+                "host": host1.pk,
+                "name": "volume5",
+            },
+            {
+                "host": host2.pk,
+                "name": "volume6",
+            },
+        ]
+
+    def test_that_embedded_anonymous_volume_is_created(self):
+        """Test that embedded anonymous Volume is created on Container update"""
+
+        # Assign model-level permission
+        obj_perm = ObjectPermission(
+            name="Test permission", actions=["add", "change", "view"]
+        )
+        obj_perm.save()
+        # pylint: disable=E1101
+        obj_perm.users.add(self.user)
+        # pylint: disable=E1101
+        obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Container))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Mount))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Image))
+
+        host = Host.objects.create(endpoint="http://localhost:8088", name="host8")
+
+        registry = Registry.objects.create(
+            host=host, name="registry8", serveraddress="http://localhost:8089"
+        )
+
+        image = Image.objects.create(host=host, name="image8", registry=registry)
+
+        container = Container.objects.create(host=host, image=image, name="container8")
+
+        response = self.client.patch(
+            reverse(f"plugins-api:{self._get_view_namespace()}:container-list"),
+            # pylint: disable=C0301
+            [
+                {
+                    "id": container.pk,
+                    "host": host.pk,
+                    "mounts": [
+                        {
+                            "source": "/var/lib/docker/volumes/2419be4bd98f41a8e625c9e4479c1c5b0f8da4b5807f08a0340aa7a2e1574fdd/_data",
+                            "volume": {
+                                "name": "2419be4bd98f41a8e625c9e4479c1c5b0f8da4b5807f08a0340aa7a2e1574fdd",
+                                "host": host.pk,
+                            },
+                        },
+                        {
+                            "source": "/var/lib/docker/volumes/844654ee4ac9d716679ed38b83c4ab6830a9db60ebf3fb2c000c7454bc41e9e2/_data",
+                            "volume": {
+                                "name": "844654ee4ac9d716679ed38b83c4ab6830a9db60ebf3fb2c000c7454bc41e9e2",
+                                "host": host.pk,
+                            },
+                        },
+                    ],
+                }
+            ],
+            format="json",
+            **self.header,
+        )
+
+        self.assertHttpStatus(response, status.HTTP_200_OK)
+
+        self.assertTrue(
+            Volume.objects.filter(
+                name="2419be4bd98f41a8e625c9e4479c1c5b0f8da4b5807f08a0340aa7a2e1574fdd",
+                host=host.pk,
+            ).exists()
+        )
+
+        self.assertTrue(
+            Volume.objects.filter(
+                name="844654ee4ac9d716679ed38b83c4ab6830a9db60ebf3fb2c000c7454bc41e9e2",
+                host=host.pk,
+            ).exists()
+        )

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/views/container.py

@@ -81,6 +81,7 @@ class ContainerBulkDeleteView(generic.BulkDeleteView):
 class ContainerDeleteView(generic.ObjectDeleteView):
     """Container delete view definition"""
 
+    default_return_url = "plugins:netbox_docker_plugin:container_list"
     queryset = Container.objects.all()
 
 

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/views/host.py

@@ -109,6 +109,7 @@ class HostBulkImportView(generic.BulkImportView):
 class HostDeleteView(generic.ObjectDeleteView):
     """Host delete view definition"""
 
+    default_return_url = "plugins:netbox_docker_plugin:host_list"
     queryset = Host.objects.all()
 
 

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/views/image.py

@@ -51,6 +51,7 @@ class ImageBulkImportView(generic.BulkImportView):
 class ImageDeleteView(generic.ObjectDeleteView):
     """Image delete view definition"""
 
+    default_return_url = "plugins:netbox_docker_plugin:image_list"
     queryset = Image.objects.all()
 
 

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/views/network.py

@@ -50,6 +50,7 @@ class NetworkBulkImportView(generic.BulkImportView):
 class NetworkDeleteView(generic.ObjectDeleteView):
     """Network delete view definition"""
 
+    default_return_url = "plugins:netbox_docker_plugin:network_list"
     queryset = Network.objects.all()
 
 

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/netbox_docker_plugin/views/volume.py

@@ -50,4 +50,5 @@ class VolumeBulkDeleteView(generic.BulkDeleteView):
 class VolumeDeleteView(generic.ObjectDeleteView):
     """Volume delete view definition"""
 
+    default_return_url = "plugins:netbox_docker_plugin:volume_list"
     queryset = Volume.objects.all()

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 1.6.0
+Version: 1.6.2
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin

{netbox_docker_plugin-1.6.0 → netbox_docker_plugin-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-docker-plugin"
-version = "1.6.0"
+version = "1.6.2"
 authors = [
   { name="Vincent Simonin", email="vincent@saashup.com" },
 ]

netbox_docker_plugin-1.6.0/netbox_docker_plugin/tests/volume/test_volume_api.py

@@ -1,44 +0,0 @@
-"""Volume Test Case"""
-
-from utilities.testing import APIViewTestCases
-from netbox_docker_plugin.models.host import Host
-from netbox_docker_plugin.models.volume import Volume
-from netbox_docker_plugin.tests.base import BaseAPITestCase
-
-
-class VolumeApiTestCase(
-    BaseAPITestCase,
-    APIViewTestCases.GetObjectViewTestCase,
-    APIViewTestCases.ListObjectsViewTestCase,
-    APIViewTestCases.CreateObjectViewTestCase,
-    APIViewTestCases.UpdateObjectViewTestCase,
-    APIViewTestCases.DeleteObjectViewTestCase,
-):
-    """Volume Test Case Class"""
-
-    model = Volume
-    brief_fields = ["display", "driver", "id", "name", "url"]
-
-    @classmethod
-    def setUpTestData(cls) -> None:
-        host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
-        host2 = Host.objects.create(endpoint="http://localhost:8080", name="host2")
-
-        Volume.objects.create(host=host1, name="volume1")
-        Volume.objects.create(host=host1, name="volume2")
-        Volume.objects.create(host=host2, name="volume3")
-
-        cls.create_data = [
-            {
-                "host": host1.pk,
-                "name": "volume4",
-            },
-            {
-                "host": host1.pk,
-                "name": "volume5",
-            },
-            {
-                "host": host2.pk,
-                "name": "volume6",
-            },
-        ]