netbox-docker-plugin 3.3.0__tar.gz → 4.0.1__tar.gz

{netbox_docker_plugin-3.3.0/netbox_docker_plugin.egg-info → netbox_docker_plugin-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 3.3.0
+Version: 4.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
@@ -57,6 +57,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 3.\*           | 1.\*                         |
 | 4.0.\*         | 2.\*                         |
 | 4.1.\*         | 3.\*                         |
+| 4.2.\*         | 4.\*                         |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/README.md

@@ -43,6 +43,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 3.\*           | 1.\*                         |
 | 4.0.\*         | 2.\*                         |
 | 4.1.\*         | 3.\*                         |
+| 4.2.\*         | 4.\*                         |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.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 = "3.3.0"
+    version = "4.0.1"
     base_url = "docker"
-    min_version = "4.1.0"
+    min_version = "4.2.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-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/api/views.py

@@ -145,6 +145,7 @@ class ContainerViewSet(NetBoxModelViewSet):
         "host",
         "ports",
         "labels",
+        "log_driver_options",
         "tags",
     )
     filterset_class = filtersets.ContainerFilterSet

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/forms/container.py

@@ -19,7 +19,6 @@ from ..models.container import (
     Container,
     ContainerRestartPolicyChoices,
     ContainerCapAddChoices,
-    ContainerLogDriverChoices,
 )
 from ..models.image import Image
 
@@ -122,7 +121,7 @@ class ContainerFilterForm(NetBoxModelFilterSetForm):
         label="Restart Policy", choices=ContainerRestartPolicyChoices, required=False
     )
     log_driver = forms.ChoiceField(
-        label="Logging driver", choices=ContainerLogDriverChoices, required=False
+        label="Logging driver", required=False
     )
     tag = TagFilterField(model)
 
@@ -138,11 +137,10 @@ class ContainerImportForm(NetBoxModelImportForm):
         + "`always`, `unless-stopped`.",
     )
 
-    log_driver = forms.ChoiceField(
+    log_driver = forms.CharField(
         label="Logging driver",
-        choices=ContainerLogDriverChoices,
         required=False,
-        help_text="Logging driver. Can be `json-log`, `syslog`.",
+        help_text="Logging driver. Can be `json-file`, `syslog`.",
     )
 
     class Meta:
@@ -170,10 +168,9 @@ class ContainerBulkEditForm(NetBoxModelBulkEditForm):
         choices=ContainerRestartPolicyChoices,
         required=True,
     )
-    log_driver = forms.ChoiceField(
+    log_driver = forms.CharField(
         label="Logging driver",
-        choices=ContainerLogDriverChoices,
-        required=True,
+        required=False,
     )
     hostname = forms.CharField(
         label="Hostname", max_length=256, min_length=1, required=False

netbox_docker_plugin-4.0.1/netbox_docker_plugin/migrations/0036_alter_container_log_driver.py

@@ -0,0 +1,24 @@
+# pylint: disable=C0103
+"""Migration file"""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """Migration file"""
+
+    dependencies = [
+        ("netbox_docker_plugin", "0035_container_log_driver_logdriveroption"),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            "UPDATE netbox_docker_plugin_container "
+            + "SET log_driver='json-file' WHERE log_driver='json-log'"
+        ),
+        migrations.AlterField(
+            model_name="container",
+            name="log_driver",
+            field=models.CharField(default="json-file", max_length=32),
+        ),
+    ]

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/models/container.py

@@ -73,19 +73,6 @@ class ContainerRestartPolicyChoices(ChoiceSet):
     ]
 
 
-class ContainerLogDriverChoices(ChoiceSet):
-    """Container log driver choices definition class"""
-
-    key = "Container.log_driver"
-
-    DEFAULT_VALUE = "json-log"
-
-    CHOICES = [
-        ("json-log", "json-log", "blue"),
-        ("syslog", "syslog", "blue"),
-    ]
-
-
 class PortTypeChoices(ChoiceSet):
     """Port type choices definition class"""
 
@@ -112,6 +99,8 @@ class ContainerCapAddChoices(ChoiceSet):
 class Container(NetBoxModel):
     """Container definition class"""
 
+    DEFAULT_LOG_DRIVER = "json-file"
+
     host = models.ForeignKey(Host, on_delete=models.CASCADE, related_name="containers")
     image = models.ForeignKey(
         Image, on_delete=models.RESTRICT, related_name="containers"
@@ -168,8 +157,7 @@ class Container(NetBoxModel):
     )
     log_driver = models.CharField(
         max_length=32,
-        choices=ContainerLogDriverChoices,
-        default=ContainerLogDriverChoices.DEFAULT_VALUE,
+        default=DEFAULT_LOG_DRIVER,
     )
 
     @property

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/models/host.py

@@ -103,9 +103,9 @@ class Host(NetBoxModel):
         return super().delete(using, keep_parents)
 
     def save(
-        self, force_insert=False, force_update=False, using=None, update_fields=None
+        self, *args, **kwargs
     ):
         if self.operation == HostOperationChoices.OPERATION_REFRESH:
             self.state = HostStateChoices.STATE_REFRESHING
 
-        return super().save(force_insert, force_update, using, update_fields)
+        return super().save(*args, **kwargs)

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/navigation.py

@@ -13,7 +13,7 @@ host_buttons = [
         icon_class="mdi mdi-plus-thick"
     ),
     PluginMenuButton(
-        link="plugins:netbox_docker_plugin:host_import",
+        link="plugins:netbox_docker_plugin:host_bulk_import",
         title="Import",
         icon_class="mdi mdi-upload"
     ),
@@ -34,7 +34,7 @@ image_buttons = [
         icon_class="mdi mdi-plus-thick"
     ),
     PluginMenuButton(
-        link="plugins:netbox_docker_plugin:image_import",
+        link="plugins:netbox_docker_plugin:image_bulk_import",
         title="Import",
         icon_class="mdi mdi-upload"
     ),
@@ -47,7 +47,7 @@ volume_buttons = [
         icon_class="mdi mdi-plus-thick"
     ),
     PluginMenuButton(
-        link="plugins:netbox_docker_plugin:volume_import",
+        link="plugins:netbox_docker_plugin:volume_bulk_import",
         title="Import",
         icon_class="mdi mdi-upload"
     ),
@@ -60,7 +60,7 @@ network_buttons = [
         icon_class="mdi mdi-plus-thick"
     ),
     PluginMenuButton(
-        link="plugins:netbox_docker_plugin:network_import",
+        link="plugins:netbox_docker_plugin:network_bulk_import",
         title="Import",
         icon_class="mdi mdi-upload"
     ),
@@ -73,7 +73,7 @@ container_buttons = [
         icon_class="mdi mdi-plus-thick"
     ),
     PluginMenuButton(
-        link="plugins:netbox_docker_plugin:container_import",
+        link="plugins:netbox_docker_plugin:container_bulk_import",
         title="Import",
         icon_class="mdi mdi-upload"
     ),

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/templates/netbox_docker_plugin/container.html

@@ -51,7 +51,7 @@
           </tr>
           <tr>
             <th scope="row">Logging driver</th>
-            <td>{{ object.get_log_driver_display }}</td>
+            <td>{{ object.log_driver }}</td>
           </tr>
         </table>
       </div>
@@ -59,20 +59,6 @@
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
-    <div class="card">
-      <h5 class="card-header">LOG DRIVER OPTIONS</h5>
-      <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'plugins:netbox_docker_plugin:logdriveroption_list' %}?container_id={{ object.pk }}"
-        hx-trigger="load"
-      ></div>
-      {% if perms.netbox_docker_plugin.add_env %}
-        <div class="card-footer text-end noprint">
-          <a href="{% url 'plugins:netbox_docker_plugin:logdriveroption_add' %}?container={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
-            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Logging driver option
-          </a>
-        </div>
-      {% endif %}
-    </div>
   </div>
   <div class="col col-md-6">
     <div class="card">
@@ -202,5 +188,21 @@
       {% endif %}
     </div>
   </div>
+  <div class="col col-md-6">
+    <div class="card">
+      <h5 class="card-header">LOG DRIVER OPTIONS</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'plugins:netbox_docker_plugin:logdriveroption_list' %}?container_id={{ object.pk }}"
+        hx-trigger="load"
+      ></div>
+      {% if perms.netbox_docker_plugin.add_env %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'plugins:netbox_docker_plugin:logdriveroption_add' %}?container={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a Logging driver option
+          </a>
+        </div>
+      {% endif %}
+    </div>
+  </div>
 </div>
 {% endblock content %}

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/tests/container/test_container_views.py

@@ -85,5 +85,6 @@ class ContainerViewsTestCase(
         cls.csv_update_data = (
             "id,name,host,image,hostname,restart_policy,log_driver",
             f"{container1.pk},container1,{host1.pk},{image1.pk},,on-failure,syslog",
-            f"{container2.pk},container2,{host1.pk},{image1.pk},container2,unless-stopped,json-log",
+            f"{container2.pk},container2,{host1.pk}"
+            + f",{image1.pk},container2,unless-stopped,json-file",
         )

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin/urls.py

@@ -29,7 +29,7 @@ urlpatterns = (
     # Host
     path("hosts/", host_views.HostListView.as_view(), name="host_list"),
     path("hosts/add/", host_views.HostEditView.as_view(), name="host_add"),
-    path("hosts/import/", host_views.HostBulkImportView.as_view(), name="host_import"),
+    path("hosts/import/", host_views.HostBulkImportView.as_view(), name="host_bulk_import"),
     path("hosts/edit/", host_views.HostBulkEditView.as_view(), name="host_bulk_edit"),
     path(
         "hosts/delete/",
@@ -69,7 +69,7 @@ urlpatterns = (
     path("images/", image_views.ImageListView.as_view(), name="image_list"),
     path("images/add/", image_views.ImageEditView.as_view(), name="image_add"),
     path(
-        "images/import/", image_views.ImageBulkImportView.as_view(), name="image_import"
+        "images/import/", image_views.ImageBulkImportView.as_view(), name="image_bulk_import"
     ),
     path(
         "images/edit/", image_views.ImageBulkEditView.as_view(), name="image_bulk_edit"
@@ -106,7 +106,7 @@ urlpatterns = (
     path(
         "volumes/import/",
         volume_views.VolumeBulkImportView.as_view(),
-        name="volume_import",
+        name="volume_bulk_import",
     ),
     path(
         "volumes/delete/",
@@ -142,7 +142,7 @@ urlpatterns = (
     path(
         "networks/import/",
         network_views.NetworkBulkImportView.as_view(),
-        name="network_import",
+        name="network_bulk_import",
     ),
     path(
         "networks/edit/",
@@ -191,7 +191,7 @@ urlpatterns = (
     path(
         "containers/import/",
         container_views.ContainerBulkImportView.as_view(),
-        name="container_import",
+        name="container_bulk_import",
     ),
     path(
         "containers/edit/",

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 3.3.0
+Version: 4.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
@@ -57,6 +57,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 3.\*           | 1.\*                         |
 | 4.0.\*         | 2.\*                         |
 | 4.1.\*         | 3.\*                         |
+| 4.2.\*         | 4.\*                         |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/netbox_docker_plugin.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ netbox_docker_plugin/migrations/0032_device_and_more.py
 netbox_docker_plugin/migrations/0033_host_operation.py
 netbox_docker_plugin/migrations/0034_volume_max_size.py
 netbox_docker_plugin/migrations/0035_container_log_driver_logdriveroption.py
+netbox_docker_plugin/migrations/0036_alter_container_log_driver.py
 netbox_docker_plugin/migrations/__init__.py
 netbox_docker_plugin/models/__init__.py
 netbox_docker_plugin/models/container.py

{netbox_docker_plugin-3.3.0 → netbox_docker_plugin-4.0.1}/pyproject.toml

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