Retry firmware v2 #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Tosinibikunle wants to merge 14 commits into openwisp:master from Tosinibikunle:retry-firmware-v2

The diff you're trying to view is too large. We only load the first 3000 changed files.

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ __pycache__/ @@
     # Distribution / packaging
     .Python
-    env/
+    venv/
     build/
     develop-eggs/
     dist/
@@ Expand Down @@

docker-compose.yml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    version: "3"
+    # version: "3"
     services:
       redis:
@@ Expand Down @@

openwisp_firmware_upgrader/admin.py

-Original file line number
+Diff line change
@@ Expand Up @@
     reversion.register(model=DeviceFirmware, follow=["device"])
     reversion.register(model=UpgradeOperation)
     DeviceAdmin.add_reversion_following(follow=["devicefirmware", "upgradeoperation_set"])
+    DeviceAdmin.conditional_inlines += []

openwisp_firmware_upgrader/api/urls.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,12 @@ @@
                         views.category_detail,
                         name="api_category_detail",
                     ),
+                    path(
+                        "upgrades/<uuid:pk>/retry/",
+                        views.upgrade_operation_retry,
+                        name="upgradeoperation-retry"),
                     path(
                         "batch-upgrade-operation/",
                         views.batch_upgrade_operation_list,
@@ Expand Down @@

openwisp_firmware_upgrader/api/views.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ @@
     from rest_framework.request import clone_request
     from rest_framework.response import Response
     from rest_framework.utils.serializer_helpers import ReturnDict
+    from rest_framework.decorators import api_view
+    from django.shortcuts import get_object_or_404
     from openwisp_firmware_upgrader import private_storage
     from openwisp_users.api.mixins import FilterByOrganizationManaged
@@ Expand Down Expand Up / @@ -52,7 +54,7 @@ def get_queryset(self): @@
                     organization_filter = {self.organization_field + "__slug": org_filtered}
                     qs = qs.filter(**organization_filter)
             except ValidationError:
-                # when uuid is not valid
                 qs = []
             return qs
@@ Expand Down Expand Up @@
             data = {**serializer.data}
             if upgrade_operation:
                 data.update({"upgrade_operation": {"id": upgrade_operation.id}})
-            return ReturnDict(data, serializer=serializer)
-        def update(self, request, *args, **kwargs):
-            partial = kwargs.pop("partial", False)
+    def update(self, request, *args, **kwargs):
+        partial = kwargs.pop("partial", False)
+        instance = self.get_object_or_none()
+        serializer = self.get_serializer(instance, data=request.data, partial=partial)
+        serializer.is_valid(raise_exception=True)
+        if instance is None:
+            self.perform_create(serializer)
             instance = self.get_object_or_none()
-            serializer = self.get_serializer(instance, data=request.data, partial=partial)
-            serializer.is_valid(raise_exception=True)
-            if instance is None:
-                self.perform_create(serializer)
-                instance = self.get_object_or_none()
-                uo = instance.device.upgradeoperation_set.latest("created")
-                data = self._get_response_data(serializer, uo)
-                image_qs = self._get_image_queryset(uo, instance.device)
-                serializer.fields["image"].queryset = image_qs
-                return Response(data, status=status.HTTP_201_CREATED)
-            self.perform_update(serializer)
             uo = instance.device.upgradeoperation_set.latest("created")
             data = self._get_response_data(serializer, uo)
             image_qs = self._get_image_queryset(uo, instance.device)
             serializer.fields["image"].queryset = image_qs
-            return Response(data, status=status.HTTP_200_OK)
+            return Response(data, status=status.HTTP_201_CREATED)
+        self.perform_update(serializer)
+        uo = instance.device.upgradeoperation_set.latest("created")
+        data = self._get_response_data(serializer, uo)
+        image_qs = self._get_image_queryset(uo, instance.device)
+        serializer.fields["image"].queryset = image_qs
+        return Response(data, status=status.HTTP_200_OK)
+    def perform_create(self, serializer):
+        serializer.save()
         def perform_create(self, serializer):
             serializer.save()
@@ Expand All / @@ -345,14 +347,23 @@ def get_object_or_none(self): @@
     build_list = BuildListView.as_view()
     build_detail = BuildDetailView.as_view()
     api_batch_upgrade = BuildBatchUpgradeView.as_view()
-    category_list = CategoryListView.as_view()
-    category_detail = CategoryDetailView.as_view()
-    batch_upgrade_operation_list = BatchUpgradeOperationListView.as_view()
-    batch_upgrade_operation_detail = BatchUpgradeOperationDetailView.as_view()
-    firmware_image_list = FirmwareImageListView.as_view()
-    firmware_image_detail = FirmwareImageDetailView.as_view()
-    firmware_image_download = FirmwareImageDownloadView.as_view()
-    upgrade_operation_list = UpgradeOperationListView.as_view()
-    upgrade_operation_detail = UpgradeOperationDetailView.as_view()
-    device_upgrade_operation_list = DeviceUpgradeOperationListView.as_view()
-    device_firmware_detail = DeviceFirmwareDetailView.as_view()
+    # Module-level API view for retrying upgrade operations
+    @api_view(["POST"])
+    def upgrade_operation_retry(request, pk):
+        """
+        Retry a failed upgrade operation
+        """
+        upgrade_op = get_object_or_404(UpgradeOperation, pk=pk)
+        if upgrade_op.status != "failed":
+            return Response(
+                {"error": "Only failed upgrades can be retried."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        # Trigger the Celery task to retry
+        from ..tasks import upgrade_firmware
+        upgrade_firmware.delay(upgrade_op.pk)
+        return Response({"detail": "Retry has been triggered."}, status=status.HTTP_202_ACCEPTED)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Retry firmware v2 #328

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Retry firmware v2 #328

Are you sure you want to change the base?

Uh oh!

Retry firmware v2 #328

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!