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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 2.7.0
+Version: 2.9.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

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

@@ -4,20 +4,21 @@ from django.db.models.signals import post_migrate
 from netbox.plugins import PluginConfig
 from .utilities import create_webhook
 
+
 class NetBoxDockerConfig(PluginConfig):
     """Plugin Config Class"""
 
     name = "netbox_docker_plugin"
     verbose_name = " NetBox Docker Plugin"
     description = "Manage Docker"
-    version = "2.7.0"
+    version = "2.9.0"
     base_url = "docker"
     min_version = "4.0.0"
-    author= "Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>"
-    author_email= "vincent@saashup.com, david.jose.delassus@gmail.com"
+    author = "Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>"
+    author_email = "vincent@saashup.com, david.jose.delassus@gmail.com"
 
     def ready(self):
-        from . import signals # pylint: disable=unused-import, import-outside-toplevel
+        from . import signals  # pylint: disable=unused-import, import-outside-toplevel
 
         post_migrate.connect(create_webhook)
 

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

@@ -43,6 +43,7 @@ class NestedHostSerializer(WritableNestedSerializer):
             "state",
             "agent_version",
             "docker_api_version",
+            "operation",
         )
 
 
@@ -615,6 +616,7 @@ class HostSerializer(NetBoxModelSerializer):
             "netbox_base_url",
             "agent_version",
             "docker_api_version",
+            "operation",
             "custom_fields",
             "created",
             "last_updated",

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/forms/host.py

@@ -72,3 +72,13 @@ class HostBulkEditForm(NetBoxModelBulkEditForm):
 
     model = Host
     fieldsets = (FieldSet("endpoint", name="General"),)
+
+
+class HostOperationForm(NetBoxModelForm):
+    """Host Operation form definition class"""
+
+    class Meta:
+        """Host form definition Meta class"""
+
+        model = Host
+        fields = ("operation",)

netbox_docker_plugin-2.9.0/netbox_docker_plugin/migrations/0033_host_operation.py

@@ -0,0 +1,20 @@
+# pylint: disable=C0103
+"""Migration file"""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """Migration file"""
+
+    dependencies = [
+        ("netbox_docker_plugin", "0032_device_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="host",
+            name="operation",
+            field=models.CharField(default="none", max_length=32),
+        ),
+    ]

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/models/container.py

@@ -53,6 +53,7 @@ class ContainerOperationChoices(ChoiceSet):
         ("restart", "Restart", "blue"),
         ("stop", "Stop", "blue"),
         ("recreate", "Recreate", "blue"),
+        ("kill", "Kill", "red"),
         ("none", "None", "white"),
     ]
 
@@ -181,13 +182,21 @@ class Container(NetBoxModel):
     @property
     def can_delete(self) -> bool:
         """Check if the container can be deleted"""
-        return self.host.state == HostStateChoices.STATE_DELETED or self.state in [
+        return self.host.state in [
+            HostStateChoices.STATE_DELETED,
+            HostStateChoices.STATE_REFRESHING,
+        ] or self.state in [
             "created",
             "paused",
             "exited",
             "dead",
         ]
 
+    @property
+    def can_kill(self) -> bool:
+        """Check if the container can be killed"""
+        return self.state in ["created", "restarting", "running", "exited", "dead"]
+
     class Meta:
         """Image Model Meta Class"""
 

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/models/host.py

@@ -20,11 +20,27 @@ class HostStateChoices(ChoiceSet):
     STATE_CREATED = "created"
     STATE_DELETED = "deleted"
     STATE_RUNNING = "running"
+    STATE_REFRESHING = "refreshing"
 
     CHOICES = [
         (STATE_CREATED, "Created", "dark"),
         (STATE_RUNNING, "Running", "blue"),
         (STATE_DELETED, "Deleted", "blue"),
+        (STATE_REFRESHING, "Refreshing", "blue"),
+    ]
+
+
+class HostOperationChoices(ChoiceSet):
+    """Host operation choices definition class"""
+
+    key = "Host.operation"
+
+    OPERATION_REFRESH = "refresh"
+    OPERATION_NONE = "none"
+
+    CHOICES = [
+        (OPERATION_REFRESH, "Refresh", "blue"),
+        (OPERATION_NONE, "None", "white"),
     ]
 
 
@@ -62,6 +78,11 @@ class Host(NetBoxModel):
         null=True,
         blank=True,
     )
+    operation = models.CharField(
+        max_length=32,
+        choices=HostOperationChoices,
+        default=HostOperationChoices.OPERATION_NONE,
+    )
 
     class Meta:
         """Host Model Meta Class"""
@@ -80,3 +101,11 @@ class Host(NetBoxModel):
         self.save()
 
         return super().delete(using, keep_parents)
+
+    def save(
+        self, force_insert=False, force_update=False, using=None, update_fields=None
+    ):
+        if self.operation == HostOperationChoices.OPERATION_REFRESH:
+            self.state = HostStateChoices.STATE_REFRESHING
+
+        return super().save(force_insert, force_update, using, update_fields)

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/signals.py

@@ -42,6 +42,7 @@ def restrict_container_actions(instance, **_kwargs):
             instance.operation == "restart" and not instance.can_restart,
             instance.operation == "stop" and not instance.can_stop,
             instance.operation == "recreate" and not instance.can_recreate,
+            instance.operation == "kill" and not instance.can_kill,
         ]
     ):
         raise AbortRequest(

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/templates/netbox_docker_plugin/container-layout.html

@@ -45,6 +45,20 @@
   </button>
 </form>
 
+<form action="{% url 'plugins:netbox_docker_plugin:container_operation' pk=object.id operation='kill' %}" method="post">
+  {% csrf_token %}
+  <input type="hidden" name="operation" value="kill">
+  <button
+    type="submit"
+    class="btn btn-dark"
+    {% if not object.can_kill %}
+    disabled
+    {% endif %}
+  >
+    <i class="mdi mdi-skull"></i> Kill
+  </button>
+</form>
+
 <form action="{% url 'plugins:netbox_docker_plugin:container_operation' pk=object.id operation='recreate' %}" method="post">
   {% csrf_token %}
   <input type="hidden" name="operation" value="recreate">

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/templates/netbox_docker_plugin/host.html

@@ -3,6 +3,16 @@
 {% load plugins %}
 {% load host %}
 
+{% block extra_controls %}
+<form action="{% url 'plugins:netbox_docker_plugin:host_operation' pk=object.id operation='refresh' %}" method="post">
+  {% csrf_token %}
+  <input type="hidden" name="operation" value="refresh">
+  <button type="submit" class="btn btn-warning">
+    <i class="mdi mdi-cog-refresh"></i> Refresh
+  </button>
+</form>
+{% endblock extra_controls %}
+
 {% block content %}
 <div class="row mb-3">
   <div class="col col-md-6">
@@ -30,6 +40,10 @@
             <th scope="row">Docker API Version</th>
             <td>{{ object.docker_api_version|placeholder }}</td>
           </tr>
+          <tr>
+            <th scope="row">Operation</th>
+            <td>{{ object.get_operation_display }}</td>
+          </tr>
         </table>
       </div>
     </div>
@@ -47,15 +61,14 @@
     <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>
+        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">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Registry
-          </a>
-        </div>
+      <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">
+          <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Registry
+        </a>
+      </div>
       {% endif %}
     </div>
     {% plugin_full_width_page object %}
@@ -64,15 +77,15 @@
     <div class="card">
       <h5 class="card-header">Container</h5>
       <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'plugins:netbox_docker_plugin:container_list' %}?host_id={{ object.pk }}"
-        hx-trigger="load"
-      ></div>
+        hx-get="{% url 'plugins:netbox_docker_plugin:container_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:container_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Container
-          </a>
-        </div>
+      <div class="card-footer text-end noprint">
+        <a href="{% url 'plugins:netbox_docker_plugin:container_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}"
+          class="btn btn-primary">
+          <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Container
+        </a>
+      </div>
       {% endif %}
     </div>
     {% plugin_full_width_page object %}
@@ -81,15 +94,14 @@
     <div class="card">
       <h5 class="card-header">Images</h5>
       <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'plugins:netbox_docker_plugin:image_list' %}?host_id={{ object.pk }}"
-        hx-trigger="load"
-      ></div>
+        hx-get="{% url 'plugins:netbox_docker_plugin:image_list' %}?host_id={{ object.pk }}" hx-trigger="load"></div>
       {% if perms.netbox_docker_plugin.add_image %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_docker_plugin:image_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add an Image
-          </a>
-        </div>
+      <div class="card-footer text-end noprint">
+        <a href="{% url 'plugins:netbox_docker_plugin:image_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}"
+          class="btn btn-primary">
+          <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add an Image
+        </a>
+      </div>
       {% endif %}
     </div>
     {% plugin_full_width_page object %}
@@ -98,15 +110,14 @@
     <div class="card">
       <h5 class="card-header">Volumes</h5>
       <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'plugins:netbox_docker_plugin:volume_list' %}?host_id={{ object.pk }}"
-        hx-trigger="load"
-      ></div>
+        hx-get="{% url 'plugins:netbox_docker_plugin:volume_list' %}?host_id={{ object.pk }}" hx-trigger="load"></div>
       {% if perms.netbox_docker_plugin.add_volume %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_docker_plugin:volume_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Volume
-          </a>
-        </div>
+      <div class="card-footer text-end noprint">
+        <a href="{% url 'plugins:netbox_docker_plugin:volume_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}"
+          class="btn btn-primary">
+          <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Volume
+        </a>
+      </div>
       {% endif %}
     </div>
     {% plugin_full_width_page object %}
@@ -115,15 +126,14 @@
     <div class="card">
       <h5 class="card-header">Networks</h5>
       <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'plugins:netbox_docker_plugin:network_list' %}?host_id={{ object.pk }}"
-        hx-trigger="load"
-      ></div>
+        hx-get="{% url 'plugins:netbox_docker_plugin:network_list' %}?host_id={{ object.pk }}" hx-trigger="load"></div>
       {% if perms.netbox_docker_plugin.add_network %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_docker_plugin:network_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Network
-          </a>
-        </div>
+      <div class="card-footer text-end noprint">
+        <a href="{% url 'plugins:netbox_docker_plugin:network_add' %}?host={{ object.pk }}&return_url={{ object.get_absolute_url }}"
+          class="btn btn-primary">
+          <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Network
+        </a>
+      </div>
       {% endif %}
     </div>
     {% plugin_full_width_page object %}

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/tests/container/test_container_actions.py

@@ -10,12 +10,12 @@ from netbox_docker_plugin.models.registry import Registry
 
 
 class ContainerActionTestCase(TestCase):
-    """ Test the various scenarii of container actions """
+    """Test the various scenarii of container actions"""
 
     objects = {}
 
     def test_allowed_operations(self):
-        """ Test that only specific operations are allowed according to a state """
+        """Test that only specific operations are allowed according to a state"""
 
         cases = [
             ("create", ["none"]),
@@ -23,7 +23,19 @@ class ContainerActionTestCase(TestCase):
             ("stop", ["running"]),
             ("restart", ["running"]),
             ("recreate", ["created", "exited", "dead", "running"]),
-            ("noop", ["created", "restarting", "running", "paused", "exited", "dead", "none"]),
+            ("kill", ["created", "restarting", "running", "exited", "dead"]),
+            (
+                "noop",
+                [
+                    "created",
+                    "restarting",
+                    "running",
+                    "paused",
+                    "exited",
+                    "dead",
+                    "none",
+                ],
+            ),
         ]
 
         for operation, states in cases:
@@ -48,14 +60,18 @@ class ContainerActionTestCase(TestCase):
                     )
 
     def test_forbidden_operations(self):
-        """ Test that forbidden operations raise an AbortRequest """
+        """Test that forbidden operations raise an AbortRequest"""
 
         cases = [
-            ("create", ["created", "restarting", "running", "paused", "exited", "dead"]),
+            (
+                "create",
+                ["created", "restarting", "running", "paused", "exited", "dead"],
+            ),
             ("start", ["running", "restarting", "paused", "none"]),
             ("stop", ["created", "restarting", "paused", "exited", "dead", "none"]),
             ("restart", ["created", "restarting", "paused", "exited", "dead", "none"]),
             ("recreate", ["restarting", "paused", "none"]),
+            ("kill", ["paused", "none"]),
         ]
 
         for operation, states in cases:
@@ -79,7 +95,7 @@ class ContainerActionTestCase(TestCase):
                             obj.save()
 
     def test_delete_non_running_container(self):
-        """ Test that a non running container can be deleted """
+        """Test that a non running container can be deleted"""
 
         for state in ["created", "paused", "exited", "dead"]:
             with self.subTest(operation="delete", state=state):
@@ -98,7 +114,7 @@ class ContainerActionTestCase(TestCase):
                 self.assertFalse(Container.objects.filter(name=name).exists())
 
     def test_delete_running_container(self):
-        """ Test that a running container cannot be deleted """
+        """Test that a running container cannot be deleted"""
 
         for state in ["running", "restarting", "none"]:
             with self.subTest(operation="delete", state=state):
@@ -119,9 +135,17 @@ class ContainerActionTestCase(TestCase):
                         obj.delete()
 
     def test_delete_container_on_deleted_host(self):
-        """ Test that a container on a deleted host can be deleted """
-
-        for state in ["created", "running", "restarted", "paused", "exited", "dead", "none"]:
+        """Test that a container on a deleted host can be deleted"""
+
+        for state in [
+            "created",
+            "running",
+            "restarted",
+            "paused",
+            "exited",
+            "dead",
+            "none",
+        ]:
             with self.subTest(operation="delete", state=state):
                 with transaction.atomic():
                     name = f"container-delete-{state}"
@@ -137,6 +161,33 @@ class ContainerActionTestCase(TestCase):
 
                 self.assertFalse(Container.objects.filter(name=name).exists())
 
+    def test_delete_container_on_refreshing_host(self):
+        """Test that a container on a refreshing host can be deleted"""
+
+        for state in [
+            "created",
+            "running",
+            "restarted",
+            "paused",
+            "exited",
+            "dead",
+            "none",
+        ]:
+            with self.subTest(operation="delete", state=state):
+                with transaction.atomic():
+                    name = f"container-delete-{state}"
+                    obj = Container.objects.create(
+                        host=self.objects["host3"],
+                        image=self.objects["image2"],
+                        name=name,
+                        operation="none",
+                        state=state,
+                    )
+
+                    obj.delete()
+
+                self.assertFalse(Container.objects.filter(name=name).exists())
+
     @classmethod
     def setUpTestData(cls):
         cls.objects["host1"] = Host.objects.create(
@@ -169,3 +220,8 @@ class ContainerActionTestCase(TestCase):
             registry=cls.objects["registry2"],
             name="image2",
         )
+        cls.objects["host3"] = Host.objects.create(
+            endpoint="http://localhost:8080",
+            name="host3",
+            state=HostStateChoices.STATE_REFRESHING,
+        )

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

@@ -29,6 +29,7 @@ class HostApiTestCase(
         "endpoint",
         "id",
         "name",
+        "operation",
         "state",
         "url",
     ]

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/urls.py

@@ -42,6 +42,11 @@ urlpatterns = (
         host_views.HostDeleteView.as_view(),
         name="host_delete",
     ),
+    path(
+        "hosts/<int:pk>/operation/<str:operation>/",
+        host_views.HostOperationView.as_view(),
+        name="host_operation",
+    ),
     path(
         "hosts/<int:pk>/graph/",
         host_views.HostGraphView.as_view(),

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

@@ -132,6 +132,19 @@ webhooks = [
         "payload_url": "{{ data.host.endpoint }}/api/engine/volumes",
         "ssl_verification": False,
     },
+    {
+        "name": "[Docker] Modify host",
+        "content_types": "host",
+        "enabled": True,
+        "type_create": False,
+        "type_update": True,
+        "type_delete": False,
+        "type_job_start": False,
+        "type_job_end": False,
+        "http_method": "POST",
+        "payload_url": "{{ data.endpoint }}/api/engine/endpoint",
+        "ssl_verification": False,
+    },
     {
         "name": "[Docker] Modify image",
         "content_types": "image",
@@ -198,7 +211,7 @@ def create_webhook(app_config, **kwargs):
                         type_job_start=webhook["type_job_start"],
                         type_job_end=webhook["type_job_end"],
                         action_object_id=obj.pk,
-                        action_object_type=wh_content_type
+                        action_object_type=wh_content_type,
                     )
                     eventrule.save()
 

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin/views/host.py

@@ -130,3 +130,14 @@ class HostBulkDeleteView(generic.BulkDeleteView):
     queryset = Host.objects.all()
     filterset = filtersets.HostFilterSet
     table = tables.HostTable
+
+
+class HostOperationView(generic.ObjectEditView):
+    """Host operation view definition"""
+
+    def get_object(self, **kwargs):
+        new_kwargs = {"pk": kwargs["pk"]}
+        return super().get_object(**new_kwargs)
+
+    queryset = Host.objects.all()
+    form = host.HostOperationForm

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-docker-plugin
-Version: 2.7.0
+Version: 2.9.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

{netbox_docker_plugin-2.7.0 → netbox_docker_plugin-2.9.0}/netbox_docker_plugin.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ netbox_docker_plugin/migrations/0029_alter_container_state.py
 netbox_docker_plugin/migrations/0030_alter_container_containerid_alter_container_hostname_and_more.py
 netbox_docker_plugin/migrations/0031_container_cap_add.py
 netbox_docker_plugin/migrations/0032_device_and_more.py
+netbox_docker_plugin/migrations/0033_host_operation.py
 netbox_docker_plugin/migrations/__init__.py
 netbox_docker_plugin/models/__init__.py
 netbox_docker_plugin/models/container.py

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-docker-plugin"
-version = "2.7.0"
+version = "2.9.0"
 authors = [
   { name="Vincent Simonin", email="vincent@saashup.com" },
   { name="David Delassus", email="david.jose.delassus@gmail.com" }