netbox-docker-plugin 1.4.0__tar.gz → 1.5.0__tar.gz

{netbox-docker-plugin-1.4.0/netbox_docker_plugin.egg-info → netbox-docker-plugin-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 1.4.0
+Version: 1.5.0
 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.4.0 → netbox-docker-plugin-1.5.0}/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.4.0"
+    version = "1.5.0"
     base_url = "docker"
     author= "Vincent Simonin"
     author_email= "vincent@saashup.com"

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/api/serializers.py

@@ -501,6 +501,7 @@ class RegistrySerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_docker_plugin-api:registry-detail"
     )
+    host = NestedHostSerializer()
     images = NestedImageSerializer(many=True, read_only=True)
 
     class Meta:
@@ -511,6 +512,7 @@ class RegistrySerializer(NetBoxModelSerializer):
             "id",
             "name",
             "url",
+            "host",
             "display",
             "serveraddress",
             "username",
@@ -530,6 +532,7 @@ class HostSerializer(NetBoxModelSerializer):
     volumes = NestedVolumeSerializer(many=True, read_only=True)
     networks = NestedNetworkSerializer(many=True, read_only=True)
     containers = NestedContainerSerializer(many=True, read_only=True)
+    registries = NestedRegistrySerializer(many=True, read_only=True)
     token = NestedTokenSerializer(read_only=True)
 
     class Meta:
@@ -555,4 +558,5 @@ class HostSerializer(NetBoxModelSerializer):
             "volumes",
             "networks",
             "containers",
+            "registries",
         )

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/api/views.py

@@ -23,7 +23,9 @@ from ..models.registry import Registry
 class HostViewSet(NetBoxModelViewSet):
     """Host view set class"""
 
-    queryset = Host.objects.prefetch_related("images", "volumes", "tags")
+    queryset = Host.objects.prefetch_related(
+        "images", "volumes", "networks", "containers", "registries", "tags"
+    )
     filterset_class = filtersets.HostFilterSet
     serializer_class = HostSerializer
     http_method_names = ["get", "post", "patch", "delete", "options"]
@@ -97,7 +99,7 @@ class ContainerViewSet(NetBoxModelViewSet):
 class RegistryViewSet(NetBoxModelViewSet):
     """Registry view set class"""
 
-    queryset = Registry.objects.prefetch_related("images", "tags")
+    queryset = Registry.objects.prefetch_related("host", "images", "tags")
     filterset_class = filtersets.RegistryFilterSet
     serializer_class = RegistrySerializer
     http_method_names = ["get", "post", "patch", "delete", "options"]

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/filtersets.py

@@ -49,6 +49,11 @@ class RegistryFilterSet(NetBoxModelFilterSet):
     """Registry filterset definition class"""
 
     name = filters.CharFilter(lookup_expr="icontains")
+    host_id = ModelMultipleChoiceFilter(
+        field_name="host_id",
+        queryset=Host.objects.all(),
+        label="Host (ID)",
+    )
 
     class Meta:
         """Registry filterset definition meta class"""

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/forms/image.py

@@ -1,7 +1,11 @@
 """Image Forms definitions"""
 
 from django import forms
-from utilities.forms.fields import TagFilterField, DynamicModelMultipleChoiceField
+from utilities.forms.fields import (
+    TagFilterField,
+    DynamicModelMultipleChoiceField,
+    DynamicModelChoiceField,
+)
 from netbox.forms import (
     NetBoxModelForm,
     NetBoxModelImportForm,
@@ -16,6 +20,16 @@ from ..models.registry import Registry
 class ImageForm(NetBoxModelForm):
     """Image form definition class"""
 
+    host = DynamicModelChoiceField(
+        label="Host", queryset=Host.objects.all(), required=True
+    )
+    registry = DynamicModelChoiceField(
+        label="Registry",
+        queryset=Registry.objects.all(),
+        required=True,
+        query_params={"host_id": "$host"},
+    )
+
     class Meta:
         """Image form definition Meta class"""
 

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/forms/registry.py

@@ -1,12 +1,13 @@
 """Registry Forms definitions"""
 
 from django import forms
-from utilities.forms.fields import TagFilterField
+from utilities.forms.fields import TagFilterField, DynamicModelMultipleChoiceField
 from netbox.forms import (
     NetBoxModelForm,
     NetBoxModelFilterSetForm,
 )
 from ..models.registry import Registry
+from ..models.host import Host
 
 
 class RegistryForm(NetBoxModelForm):
@@ -24,6 +25,7 @@ class RegistryForm(NetBoxModelForm):
 
         model = Registry
         fields = (
+            "host",
             "name",
             "serveraddress",
             "username",
@@ -39,5 +41,10 @@ class RegistryFilterForm(NetBoxModelFilterSetForm):
     """Registry filter form definition class"""
 
     model = Registry
+    host_id = DynamicModelMultipleChoiceField(
+        queryset=Host.objects.all(),
+        required=False,
+        label="Host",
+    )
     name = forms.CharField(label="Name", required=False)
     tag = TagFilterField(model)

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/migrations/0021_registry_and_more.py

@@ -6,7 +6,6 @@ import utilities.json
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
-import netbox_docker_plugin.models.registry
 
 
 class Migration(migrations.Migration):
@@ -60,7 +59,6 @@ class Migration(migrations.Migration):
             model_name="image",
             name="registry",
             field=models.ForeignKey(
-                default=netbox_docker_plugin.models.registry.Registry.get_default_registry,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="images",
                 to="netbox_docker_plugin.registry",

netbox-docker-plugin-1.5.0/netbox_docker_plugin/migrations/0023_delete_hosts.py

@@ -0,0 +1,33 @@
+# pylint: disable=C0103
+"""Migration file"""
+
+from django.db import migrations
+
+
+def delete_hosts(apps, schema_editor):
+    """Delete all Hosts and Registries"""
+    Host = apps.get_model("netbox_docker_plugin", "Host")
+    Host.objects.using(schema_editor.connection.alias).all().delete()
+
+    Registry = Host = apps.get_model("netbox_docker_plugin", "Registry")
+    Registry.objects.using(schema_editor.connection.alias).all().delete()
+
+
+def do_nothing(apps, schema_editor): # pylint: disable=W0613
+    """Nothing to do"""
+    return None
+
+
+class Migration(migrations.Migration):
+    """Migration file"""
+
+    dependencies = [
+        (
+            "netbox_docker_plugin",
+            "0022_bind_bind_netbox_docker_plugin_bind_unique_bind",
+        ),
+    ]
+
+    operations = [
+        migrations.RunPython(delete_hosts, do_nothing),
+    ]

netbox-docker-plugin-1.5.0/netbox_docker_plugin/migrations/0024_registry_host_alter_registry_name_and_more.py

@@ -0,0 +1,47 @@
+# pylint: disable=C0103
+"""Migration file"""
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+class Migration(migrations.Migration):
+    """Migration file"""
+
+    dependencies = [
+        (
+            "netbox_docker_plugin",
+            "0023_delete_hosts",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="registry",
+            name="host",
+            field=models.ForeignKey(
+                default=None,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="registries",
+                to="netbox_docker_plugin.host",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="registry",
+            name="name",
+            field=models.CharField(
+                max_length=255,
+                validators=[
+                    django.core.validators.MinLengthValidator(limit_value=1),
+                    django.core.validators.MaxLengthValidator(limit_value=255),
+                ],
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="registry",
+            constraint=models.UniqueConstraint(
+                fields=("host", "name"), name="netbox_docker_plugin_registry_name_host"
+            ),
+        ),
+    ]

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/models/image.py

@@ -19,7 +19,6 @@ class Image(NetBoxModel):
     host = models.ForeignKey(Host, on_delete=models.CASCADE, related_name="images")
     registry = models.ForeignKey(
         Registry,
-        default=Registry.get_default_registry,  # type: ignore
         on_delete=models.CASCADE,
         related_name="images",
     )

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/models/registry.py

@@ -1,19 +1,35 @@
 """Registry Model definition"""
 
 from django.db import models
+from django.db.models.signals import post_save
+from django.dispatch import receiver
 from django.core.validators import (
     MinLengthValidator,
     MaxLengthValidator,
 )
 from django.urls import reverse
 from netbox.models import NetBoxModel
+from .host import Host
+
+
+@receiver(post_save, sender=Host)
+def create_default_registry(sender, **kwargs): # pylint: disable=W0613
+    """Create default registry on Host creation"""
+
+    if kwargs.get("created") is True:
+        registry = Registry(
+            host=kwargs.get("instance"),
+            name="dockerhub",
+            serveraddress="https://registry.hub.docker.com/v2/",
+        )
+        registry.save()
 
 
 class Registry(NetBoxModel):
     """Registry definition class"""
 
+    host = models.ForeignKey(Host, on_delete=models.CASCADE, related_name="registries")
     name = models.CharField(
-        unique=True,
         max_length=255,
         validators=[
             MinLengthValidator(limit_value=1),
@@ -25,20 +41,16 @@ class Registry(NetBoxModel):
     password = models.CharField(blank=True, null=True, max_length=512)
     email = models.EmailField(blank=True, null=True, max_length=512)
 
-    @classmethod
-    def get_default_registry(cls):
-        """Return the default Registry"""
-        # pylint: disable=W0612
-        registry, created = cls.objects.get_or_create(
-            name="dockerhub",
-            serveraddress="https://registry.hub.docker.com/v2/",
-        )
-        return registry.pk
-
     class Meta:
         """Registry Model Meta Class"""
 
         ordering = ("name",)
+        constraints = (
+            models.UniqueConstraint(
+                fields=["host", "name"],
+                name="%(app_label)s_%(class)s_name_host",
+            ),
+        )
 
     def __str__(self):
         return f"{self.name}"

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/templates/netbox_docker_plugin/host.html

@@ -43,6 +43,23 @@
   </div>
 </div>
 <div class="row">
+  <div class="col col-md-12">
+    <div class="card">
+      <h5 class="card-header">Registry</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'plugins:netbox_docker_plugin:registry_list' %}?host_id={{ object.pk }}"
+        hx-trigger="load"
+      ></div>
+      {% if perms.netbox_docker_plugin.add_container %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'plugins:netbox_docker_plugin:registry_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Registry
+          </a>
+        </div>
+      {% endif %}
+    </div>
+    {% plugin_full_width_page object %}
+  </div>
   <div class="col col-md-12">
     <div class="card">
       <h5 class="card-header">Container</h5>

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/templates/netbox_docker_plugin/registry.html

@@ -10,6 +10,10 @@
       <h5 class="card-header">REGISTRY</h5>
       <div class="card-body">
         <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">Host</th>
+            <td><a href="{{ object.host.get_absolute_url }}">{{ object.host }}</a></td>
+          </tr>
           <tr>
             <th scope="row">Name</th>
             <td>{{ object.name }}</td>

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/container/test_container_api.py

@@ -6,6 +6,7 @@ from netbox_docker_plugin.models.host import Host
 from netbox_docker_plugin.models.network import Network
 from netbox_docker_plugin.models.image import Image
 from netbox_docker_plugin.models.volume import Volume
+from netbox_docker_plugin.models.registry import Registry
 from netbox_docker_plugin.tests.base import BaseAPITestCase
 
 
@@ -44,8 +45,15 @@ class ContainerApiTestCase(
         host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
         host2 = Host.objects.create(endpoint="http://localhost:8080", name="host2")
 
-        image1 = Image.objects.create(host=host1, name="image1")
-        image2 = Image.objects.create(host=host2, name="image2")
+        registry1 = Registry.objects.create(
+            host=host1, name="registry1", serveraddress="http://localhost:8080"
+        )
+        registry2 = Registry.objects.create(
+            host=host2, name="registry2", serveraddress="http://localhost:8082"
+        )
+
+        image1 = Image.objects.create(host=host1, name="image1", registry=registry1)
+        image2 = Image.objects.create(host=host2, name="image2", registry=registry2)
 
         network1 = Network.objects.create(host=host1, name="network1")
         network2 = Network.objects.create(host=host2, name="network2")

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/container/test_container_operation_view.py

@@ -11,6 +11,7 @@ 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
+from netbox_docker_plugin.models.registry import Registry
 from netbox_docker_plugin.tests.base import BaseModelViewTestCase
 
 
@@ -248,8 +249,15 @@ class ContainerViewsTestCase(BaseModelViewTestCase, ModelViewTestCase):
         host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
         host2 = Host.objects.create(endpoint="http://localhost:8081", name="host2")
 
-        image1 = Image.objects.create(host=host1, name="image1")
-        image2 = Image.objects.create(host=host2, name="image2")
+        registry1 = Registry.objects.create(
+            host=host1, name="registry1", serveraddress="http://localhost:8080"
+        )
+        registry2 = Registry.objects.create(
+            host=host2, name="registry2", serveraddress="http://localhost:8082"
+        )
+
+        image1 = Image.objects.create(host=host1, name="image1", registry=registry1)
+        image2 = Image.objects.create(host=host2, name="image2", registry=registry2)
 
         Container.objects.create(host=host1, image=image1, name="container1")
         Container.objects.create(host=host1, image=image1, name="container2")

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/container/test_container_validation.py

@@ -7,6 +7,7 @@ from netbox_docker_plugin.models.host import Host
 from netbox_docker_plugin.models.image import Image
 from netbox_docker_plugin.models.volume import Volume
 from netbox_docker_plugin.models.network import Network
+from netbox_docker_plugin.models.registry import Registry
 from netbox_docker_plugin.models.container import Mount, NetworkSetting
 
 
@@ -113,11 +114,22 @@ class ContainerValidationTestCase(TestCase):
             endpoint="http://localhost:8081", name="host2"
         )
 
+        cls.objects["registry1"] = Registry.objects.create(
+            host=cls.objects["host1"],
+            name="registry1",
+            serveraddress="http://localhost:8080",
+        )
+        cls.objects["registry2"] = Registry.objects.create(
+            host=cls.objects["host2"],
+            name="registry2",
+            serveraddress="http://localhost:8082",
+        )
+
         cls.objects["image1"] = Image.objects.create(
-            host=cls.objects["host1"], name="image1"
+            host=cls.objects["host1"], name="image1", registry=cls.objects["registry1"]
         )
         cls.objects["image2"] = Image.objects.create(
-            host=cls.objects["host2"], name="image2"
+            host=cls.objects["host2"], name="image2", registry=cls.objects["registry2"]
         )
 
         cls.objects["volume1"] = Volume.objects.create(

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/container/test_container_views.py

@@ -5,6 +5,7 @@ from netbox_docker_plugin.tests.base import BaseModelViewTestCase
 from netbox_docker_plugin.models.host import Host
 from netbox_docker_plugin.models.container import Container
 from netbox_docker_plugin.models.image import Image
+from netbox_docker_plugin.models.registry import Registry
 
 
 class ContainerViewsTestCase(
@@ -19,8 +20,15 @@ class ContainerViewsTestCase(
         host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
         host2 = Host.objects.create(endpoint="http://localhost:8081", name="host2")
 
-        image1 = Image.objects.create(host=host1, name="image1")
-        image2 = Image.objects.create(host=host2, name="image2")
+        registry1 = Registry.objects.create(
+            host=host1, name="registry1", serveraddress="http://localhost:8080"
+        )
+        registry2 = Registry.objects.create(
+            host=host2, name="registry2", serveraddress="http://localhost:8082"
+        )
+
+        image1 = Image.objects.create(host=host1, name="image1", registry=registry1)
+        image2 = Image.objects.create(host=host2, name="image2", registry=registry2)
 
         container1 = Container.objects.create(
             host=host1, image=image1, name="container1"

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/host/test_host_api.py

@@ -7,6 +7,7 @@ from users.models import ObjectPermission
 from rest_framework import status
 from utilities.testing import APIViewTestCases
 from netbox_docker_plugin.models.host import Host
+from netbox_docker_plugin.models.registry import Registry
 from ..base import BaseAPITestCase
 
 
@@ -50,6 +51,46 @@ class HostApiTestCase(
         super().setUp()
         self.header["HTTP_ORIGIN"] = "http://localhost:8080"
 
+    def test_create_object(self):
+        """
+        POST a single object with permission.
+        """
+        # Add object-level permission
+        obj_perm = ObjectPermission(name="Test permission", actions=["add"])
+        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))
+
+        initial_count = self._get_queryset().count()
+        response = self.client.post(
+            self._get_list_url(), self.create_data[0], format="json", **self.header
+        )
+        self.assertHttpStatus(response, status.HTTP_201_CREATED)
+        self.assertEqual(self._get_queryset().count(), initial_count + 1)
+        instance = self._get_queryset().get(pk=response.data["id"])
+        self.assertInstanceEqual(
+            instance,
+            self.create_data[0],
+            exclude=self.validation_excluded_fields,
+            api=True,
+        )
+
+        # Verify ObjectChange creation
+        if hasattr(self.model, "to_objectchange"):
+            objectchanges = ObjectChange.objects.filter(
+                changed_object_type=ContentType.objects.get_for_model(instance),
+                changed_object_id=instance.pk,
+            )
+            self.assertEqual(len(objectchanges), 1)
+            self.assertEqual(
+                objectchanges[0].action, ObjectChangeActionChoices.ACTION_CREATE
+            )
+
+        registries = Registry.objects.filter(host=instance.pk)
+        self.assertEqual(len(registries), 1)
+
     def test_delete_object(self):
         """
         DELETE a single object identified by its numeric ID.

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/tests/registry/test_registry_api.py

@@ -2,6 +2,7 @@
 
 from utilities.testing import APIViewTestCases
 from netbox_docker_plugin.models.registry import Registry
+from netbox_docker_plugin.models.host import Host
 from ..base import BaseAPITestCase
 
 
@@ -26,12 +27,30 @@ class RegistryApiTestCase(
         "url",
         "username",
     ]
-    create_data = [
+
+    @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")
+
+        Registry.objects.create(
+            host=host1, serveraddress="http://localhost:8080", name="registry0"
+        )
+        Registry.objects.create(
+            host=host1, serveraddress="http://localhost:8081", name="registry1"
+        )
+        Registry.objects.create(
+            host=host2, serveraddress="http://localhost:8082", name="registry2"
+        )
+
+        cls.create_data = [
         {
+            "host": host1.pk,
             "name": "github",
             "serveraddress": "https://ghcr.io",
         },
         {
+            "host": host2.pk,
             "name": "gitlab",
             "serveraddress": "http://registry.example.com",
             "username": "test",
@@ -39,13 +58,8 @@ class RegistryApiTestCase(
             "email": "test@example.com",
         },
         {
+            "host": host1.pk,
             "name": "registry",
             "serveraddress": "http://localhost:1010",
         },
     ]
-
-    @classmethod
-    def setUpTestData(cls) -> None:
-        Registry.objects.create(serveraddress="http://localhost:8080", name="registry0")
-        Registry.objects.create(serveraddress="http://localhost:8081", name="registry1")
-        Registry.objects.create(serveraddress="http://localhost:8082", name="registry2")

netbox-docker-plugin-1.5.0/netbox_docker_plugin/tests/registry/test_registry_views.py

@@ -0,0 +1,39 @@
+"""Registry Views Test Case"""
+
+from utilities.testing import ViewTestCases
+from netbox_docker_plugin.models.registry import Registry
+from netbox_docker_plugin.models.host import Host
+from ..base import BaseModelViewTestCase
+
+
+class RegistryTestCase(
+    BaseModelViewTestCase,
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
+    ViewTestCases.CreateObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase,
+):
+    """Registry Views Test Case Class"""
+
+    model = Registry
+
+    @classmethod
+    def setUpTestData(cls):
+        host1 = Host.objects.create(endpoint="http://localhost:8080", name="host1")
+        host2 = Host.objects.create(endpoint="http://localhost:8081", name="host2")
+
+        Registry.objects.create(host=host1, serveraddress="http://localhost:8080", name="registry0")
+        Registry.objects.create(host=host1, serveraddress="http://localhost:8081", name="registry1")
+        Registry.objects.create(host=host2, serveraddress="http://localhost:8082", name="registry2")
+
+        cls.form_data = {
+            "host": host1.pk,
+            "name": "github",
+            "serveraddress": "https://ghcr.io",
+            "username": "test",
+            "password": "thisisapassword",
+            "email": "test@example.com",
+        }

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin/views/host.py

@@ -10,13 +10,14 @@ from ..models.image import Image
 from ..models.volume import Volume
 from ..models.network import Network
 from ..models.container import Container
+from ..models.registry import Registry
 
 
 class HostView(generic.ObjectView):
     """Host view definition"""
 
     queryset = Host.objects.prefetch_related(
-        "images", "volumes", "networks", "containers"
+        "images", "volumes", "networks", "containers", "registries"
     )
 
     def get_extra_context(self, request, instance):
@@ -37,6 +38,10 @@ class HostView(generic.ObjectView):
                 Container.objects.filter(host=instance),
                 "host_id",
             ),
+            (
+                Registry.objects.filter(host=instance),
+                "host_id",
+            ),
         )
 
         return {
@@ -52,6 +57,7 @@ class HostListView(generic.ObjectListView):
         volume_count=count_related(Volume, "host"),
         network_count=count_related(Network, "host"),
         container_count=count_related(Container, "host"),
+        registry_count=count_related(Registry, "host"),
     )
     table = tables.HostTable
     filterset = filtersets.HostFilterSet

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 1.4.0
+Version: 1.5.0
 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.4.0 → netbox-docker-plugin-1.5.0}/netbox_docker_plugin.egg-info/SOURCES.txt

@@ -50,6 +50,8 @@ netbox_docker_plugin/migrations/0019_host_agent_version_host_docker_api_version.
 netbox_docker_plugin/migrations/0020_container_hostname.py
 netbox_docker_plugin/migrations/0021_registry_and_more.py
 netbox_docker_plugin/migrations/0022_bind_bind_netbox_docker_plugin_bind_unique_bind.py
+netbox_docker_plugin/migrations/0023_delete_hosts.py
+netbox_docker_plugin/migrations/0024_registry_host_alter_registry_name_and_more.py
 netbox_docker_plugin/migrations/__init__.py
 netbox_docker_plugin/models/__init__.py
 netbox_docker_plugin/models/container.py

{netbox-docker-plugin-1.4.0 → netbox-docker-plugin-1.5.0}/pyproject.toml

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

netbox-docker-plugin-1.4.0/netbox_docker_plugin/tests/registry/test_registry_views.py

@@ -1,33 +0,0 @@
-"""Registry Views Test Case"""
-
-from utilities.testing import ViewTestCases
-from netbox_docker_plugin.models.registry import Registry
-from ..base import BaseModelViewTestCase
-
-
-class RegistryTestCase(
-    BaseModelViewTestCase,
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.GetObjectChangelogViewTestCase,
-    ViewTestCases.CreateObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase,
-):
-    """Registry Views Test Case Class"""
-
-    model = Registry
-    form_data = {
-        "name": "github",
-        "serveraddress": "https://ghcr.io",
-        "username": "test",
-        "password": "thisisapassword",
-        "email": "test@example.com",
-    }
-
-    @classmethod
-    def setUpTestData(cls):
-        Registry.objects.create(serveraddress="http://localhost:8080", name="registry0")
-        Registry.objects.create(serveraddress="http://localhost:8081", name="registry1")
-        Registry.objects.create(serveraddress="http://localhost:8082", name="registry2")