Merge branch 'master' into issues/250-handle-missing-credentials-validation

Author: nemesifier

.github/workflows/ci.yml

@@ -5,9 +5,11 @@ on:
   push:
     branches:
       - master
+      - "1.2"
   pull_request:
     branches:
       - master
+      - "1.2"
 
 jobs:
   build:

CHANGES.rst

@@ -6,6 +6,15 @@ Version 1.3.0 [unreleased]
 
 Work in progress.
 
+Version 1.2.1 [2025-12-30]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Added data migration to update firmware image identifiers `#358
+  <https://github.com/openwisp/openwisp-firmware-upgrader/issues/358>`_
+
 Version 1.2.0 [2025-10-24]
 --------------------------
 

openwisp_firmware_upgrader/migrations/0012_update_image_type_identifiers.py

@@ -0,0 +1,24 @@
+from django.db import migrations
+
+from . import update_image_types_forward, update_image_types_reverse
+
+
+def update_image_types_forward_helper(apps, schema_editor):
+    update_image_types_forward(apps, schema_editor, "firmware_upgrader")
+
+
+def update_image_types_reverse_helper(apps, schema_editor):
+    update_image_types_reverse(apps, schema_editor, "firmware_upgrader")
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("firmware_upgrader", "0011_alter_category_organization"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            update_image_types_forward_helper,
+            reverse_code=update_image_types_reverse_helper,
+        ),
+    ]

openwisp_firmware_upgrader/migrations/__init__.py

@@ -61,3 +61,33 @@ def create_permissions_for_default_groups(apps, schema_editor, app_label):
 def create_device_firmware_for_connections(apps, schema_editor, app_label):
     for device_connection in DeviceConnection.objects.all():
         DeviceFirmware.create_for_device(device_connection.device)
+
+
+# Mapping of old image type identifiers to new ones
+IMAGE_TYPE_MAPPING = {
+    "octeon-erlite-squashfs-sysupgrade.tar": "octeon-generic-ubnt_edgerouter-lite-squashfs-sysupgrade.tar",
+    "ath79-generic-ubnt_unifi-squashfs-sysupgrade.bin": "ath79-generic-ubnt_unifi-ap-squashfs-sysupgrade.bin",
+    "x86-generic-combined-squashfs.img.gz": "x86-generic-generic-squashfs-combined.img.gz",
+    "x86-geode-combined-squashfs.img.gz": "x86-geode-generic-squashfs-combined.img.gz",
+}
+
+# Reverse mapping for rollback
+REVERSE_IMAGE_TYPE_MAPPING = {v: k for k, v in IMAGE_TYPE_MAPPING.items()}
+
+
+def update_image_types_forward(apps, schema_editor, app_label):
+    """
+    Updates firmware image type identifiers from old values to new values.
+    """
+    FirmwareImage = apps.get_model(app_label, "FirmwareImage")
+    for old_type, new_type in IMAGE_TYPE_MAPPING.items():
+        FirmwareImage.objects.filter(type=old_type).update(type=new_type)
+
+
+def update_image_types_reverse(apps, schema_editor, app_label):
+    """
+    Reverts firmware image type identifiers from new values back to old values.
+    """
+    FirmwareImage = apps.get_model(app_label, "FirmwareImage")
+    for new_type, old_type in REVERSE_IMAGE_TYPE_MAPPING.items():
+        FirmwareImage.objects.filter(type=new_type).update(type=old_type)

requirements-test.txt

@@ -3,4 +3,4 @@ openwisp-notifications @ https://github.com/openwisp/openwisp-notifications/arch
 django-redis~=6.0.0
 mock-ssh-server~=0.9.1
 responses~=0.25.8
-psycopg2-binary~=2.9.10
+psycopg2-binary~=2.9.11