Rebase

Author: carbonarok

netbox_onboarding/models.py

@@ -15,7 +15,10 @@
 from django.dispatch import receiver
 from django.db import models
 from django.urls import reverse
+<<<<<<< HEAD
 from dcim.models import Device
+=======
+>>>>>>> 83ada44... NetBox 2.9 support
 from .choices import OnboardingStatusChoices, OnboardingFailChoices
 from .release import NETBOX_RELEASE_CURRENT, NETBOX_RELEASE_29
 
@@ -57,6 +60,14 @@ class OnboardingTask(ChangeLoggedModel):
         help_text="Timeout period in sec to wait while connecting to the device", default=30
     )
 
+<<<<<<< HEAD
+=======
+    created_on = models.DateTimeField(auto_now_add=True)
+
+    class Meta:  # noqa: D106 "missing docstring in public nested class"
+        ordering = ["created_on"]
+
+>>>>>>> 83ada44... NetBox 2.9 support
     def __str__(self):
         """String representation of an OnboardingTask."""
         return f"{self.site} : {self.ip_address}"
@@ -69,6 +80,7 @@ def get_absolute_url(self):
         from utilities.querysets import RestrictedQuerySet  # pylint: disable=no-name-in-module, import-outside-toplevel
 
         objects = RestrictedQuerySet.as_manager()
+<<<<<<< HEAD
 
 
 class OnboardingDevice(models.Model):
@@ -151,3 +163,5 @@ def init_onboarding_for_new_device(sender, instance, created, **kwargs):  # pyli
     """
     if created:
         OnboardingDevice.objects.create(device=instance)
+=======
+>>>>>>> 83ada44... NetBox 2.9 support

netbox_onboarding/netbox_keeper.py

@@ -411,7 +411,11 @@ def ensure_primary_ip(self):
         )
 
         if created or not self.nb_primary_ip in self.nb_mgmt_ifname.ip_addresses.all():
+<<<<<<< HEAD
             logger.info("ASSIGN: IP address %s to %s", self.nb_primary_ip.address, self.nb_mgmt_ifname.name)
+=======
+            logging.info("ASSIGN: IP address %s to %s", self.nb_primary_ip.address, self.nb_mgmt_ifname.name)
+>>>>>>> 83ada44... NetBox 2.9 support
             self.nb_mgmt_ifname.ip_addresses.add(self.nb_primary_ip)
             self.nb_mgmt_ifname.save()
 

netbox_onboarding/tables.py

@@ -30,7 +30,11 @@ class Meta(BaseTable.Meta):  # noqa: D106 "Missing docstring in public nested cl
         fields = (
             "pk",
             "id",
+<<<<<<< HEAD
             "created",
+=======
+            "created_on",
+>>>>>>> 83ada44... NetBox 2.9 support
             "ip_address",
             "site",
             "platform",

netbox_onboarding/templates/netbox_onboarding/onboardingtask.html

@@ -18,11 +18,14 @@ <h1>{% block title %}Device: {{ onboardingtask.ip_address }}{% endblock %}</h1>
         <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
             <a href="{{ onboardingtask.get_absolute_url }}">Onboarding Task</a>
         </li>
+<<<<<<< HEAD
         {% if perms.extras.view_objectchange %}
             <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
                 <a href="{% url 'plugins:netbox_onboarding:onboardingtask_changelog' pk=onboardingtask.pk %}">Change Log</a>
             </li>
         {% endif %}
+=======
+>>>>>>> 83ada44... NetBox 2.9 support
     </ul>
 {% endblock %}
 
@@ -79,8 +82,13 @@ <h1>{% block title %}Device: {{ onboardingtask.ip_address }}{% endblock %}</h1>
                     <td>{{ onboardingtask.message|placeholder }}</td>
                 </tr>
                 <tr>
+<<<<<<< HEAD
                     <td>Created</td>
                     <td>{{ onboardingtask.created|placeholder }}</td>
+=======
+                    <td>Created On</td>
+                    <td>{{ onboardingtask.created_on|placeholder }}</td>
+>>>>>>> 83ada44... NetBox 2.9 support
                 </tr>
             </table>
         </div>

netbox_onboarding/urls.py

@@ -29,10 +29,13 @@
     path("add/", OnboardingTaskCreateView.as_view(), name="onboardingtask_add"),
     path("delete/", OnboardingTaskBulkDeleteView.as_view(), name="onboardingtask_bulk_delete"),
     path("import/", OnboardingTaskFeedBulkImportView.as_view(), name="onboardingtask_import"),
+<<<<<<< HEAD
     path(
         "<int:pk>/changelog/",
         ObjectChangeLogView.as_view(),
         name="onboardingtask_changelog",
         kwargs={"model": OnboardingTask},
     ),
+=======
+>>>>>>> 83ada44... NetBox 2.9 support
 ]

netbox_onboarding/views.py

@@ -57,6 +57,38 @@ class ReleaseMixinOnboardingTaskFeedBulkImportView(PermissionRequiredMixin):
         permission_required = "netbox_onboarding.add_onboardingtask"
 
 
+<<<<<<< HEAD
+=======
+if NETBOX_RELEASE_CURRENT < NETBOX_RELEASE_29:
+    from django.contrib.auth.mixins import PermissionRequiredMixin  # pylint: disable=ungrouped-imports
+
+    class ReleaseMixinOnboardingTaskView(PermissionRequiredMixin, View):
+        """Release Mixin View for presenting a single OnboardingTask."""
+
+        permission_required = "netbox_onboarding.view_onboardingtask"
+
+    class ReleaseMixinOnboardingTaskListView(PermissionRequiredMixin):
+        """Release Mixin View for listing all extant OnboardingTasks."""
+
+        permission_required = "netbox_onboarding.view_onboardingtask"
+
+    class ReleaseMixinOnboardingTaskCreateView(PermissionRequiredMixin):
+        """Release Mixin View for creating a new OnboardingTask."""
+
+        permission_required = "netbox_onboarding.add_onboardingtask"
+
+    class ReleaseMixinOnboardingTaskBulkDeleteView(PermissionRequiredMixin):
+        """Release Mixin View for deleting one or more OnboardingTasks."""
+
+        permission_required = "netbox_onboarding.delete_onboardingtask"
+
+    class ReleaseMixinOnboardingTaskFeedBulkImportView(PermissionRequiredMixin):
+        """Release Mixin View for bulk-importing a CSV file to create OnboardingTasks."""
+
+        permission_required = "netbox_onboarding.add_onboardingtask"
+
+
+>>>>>>> 83ada44... NetBox 2.9 support
 else:
     from utilities.views import ObjectView  # pylint: disable=ungrouped-imports, no-name-in-module