[change] Removed support for restoring FirmwareBuild objects #173

AbhigyaShridhar · 2022-01-21T12:41:57Z

[firmware-upgrader/admin.py/Firmware Build Recovery] Removed reversion as a dependency to remove recovery of deleted builds #170

I removed reversion from requirements.txt and from admin.py to remove the Recovery of deleted firmware builds option.
Fixes #170'

…firmware builds

pandafy

It was not asked in #170 to remove reversion support for everything in firmware upgrader.

It was asked to remove support for FirmwareBuild objects, i.e Build objects.

Start from updating BuildAdmin

openwisp-firmware-upgrader/openwisp_firmware_upgrader/admin.py

Line 93 in 9df7d2d

class BuildAdmin(BaseVersionAdmin):

Reference django-reversion documentation to learn about VersionAdmin: https://django-reversion.readthedocs.io/en/stable/admin.html

nemesifier

It was not asked in #170 to remove reversion support for everything in firmware upgrader.

It was asked to remove support for FirmwareBuild objects, i.e Build objects.

Start from updating BuildAdmin

openwisp-firmware-upgrader/openwisp_firmware_upgrader/admin.py

Line 93 in 9df7d2d

class BuildAdmin(BaseVersionAdmin):

Reference django-reversion documentation to learn about VersionAdmin: https://django-reversion.readthedocs.io/en/stable/admin.html

Gagan is correct. There's also a conflict with the latest master, please rebase on the latest master.

Replaced Version Admin with ModelAdmin as a superclass in admin.py/BuildAdmin, Also removed the reversion_register function which was meant to register the model associated with BuildAdmin (Firmware Build), for recovery option. Fixes openwisp#170

In admin.py, replaced BaseVersionAdmin from BaseAdmin, as a superclass for 'BuildAdmin', as it is no longer desired to add a recovery option for firmware builds and images Fixes openwisp#170

pandafy

The tests are failing due to following code

openwisp-firmware-upgrader/openwisp_firmware_upgrader/admin.py

Line 375 in 0f1b8d6

reversion.register(model=DeviceFirmware, follow=['device', 'image'])

It is required to remove image from the list in above code.

pandafy · 2022-02-15T13:18:35Z

openwisp_firmware_upgrader/admin.py

-                'build',
-            )
-        return super().reversion_register(model, **kwargs)
+    # removed overriding reversion_register as recovery operation is no longer desired


You can also remove this comment

@AbhigyaShridhar can you proceed with this?

Hi @pandafy , I made the requested changes. The branch was already up to date with master though. Please let me know if something else needs to be done.

Apologies for the late reply, was facing some health issues in the past week.

Hi @pandafy , I made the requested changes. The branch was already up to date with master though. Please let me know if something else needs to be done.

Thank you for the update!

Apologies for the late reply, was facing some health issues in the past week.

No worries, get well soon! 😊

pandafy · 2022-02-15T13:46:03Z

openwisp_firmware_upgrader/admin.py

@@ -90,7 +90,7 @@ class CategoryFilter(MultitenantOrgFilter):


 @admin.register(load_model('Build'))
-class BuildAdmin(BaseVersionAdmin):
+class BuildAdmin(BaseAdmin):


~~We don't want to remove reversion for Build model, but for FirmwareImage model.~~

Correction: After discussion with @nemesisdesign, we came to the conclusion that we want to remove Build model from reversion. Hence, the above change is correct.

To fix tests, it is required to remove following snippet of code as well

openwisp-firmware-upgrader/openwisp_firmware_upgrader/admin.py

Lines 53 to 56 in 91fe0b2

def reversion_register(self, model, **kwargs):

if model == Category:

kwargs['follow'] = (*kwargs['follow'], 'build_set')

return super().reversion_register(model, **kwargs)

Replaced BaseVersionAdmin from BaseAdmin as a super class in BuildAdmin and removed reversion support from BuildAdmin, thus no longer allowing recovery of deleted Firmware Builds. Also removed the overriding of the 'reversion_register' method in CategoryAdmin to avoid failure of tests. Fixes openwisp#170

pandafy · 2022-02-16T14:42:23Z

openwisp_firmware_upgrader/tests/test_admin.py

@@ -109,7 +109,7 @@ def test_upgrade_selected_error(self):
    def test_upgrade_intermediate_page_related(self):
        self._login()
        env = self._create_upgrade_env()
-        with self.assertNumQueries(17):
+        with self.assertNumQueries(15):


The number of queries changes because we removed VersionAdmin from BuildAdmin class

pandafy

@AbhigyaShridhar can you rebase this PR on the latest master branch?

pandafy · 2022-02-22T17:52:17Z

openwisp_firmware_upgrader/admin.py

-                'build',
-            )
-        return super().reversion_register(model, **kwargs)
+    # removed overriding reversion_register as recovery operation is no longer desired


@AbhigyaShridhar can you proceed with this?

…#173 Removed an extra comment, also did some minor formating to make sure all checks in ./run-qa-checks work fixes openwisp#173

pandafy

LGTM 👍🏼 ! Thank you for contributing @AbhigyaShridhar

Deferring merge to @nemesisdesign 😄

nemesifier

Thanks @AbhigyaShridhar @pandafy! 👍

removed reversion dependency to remove the option to recover deleted …

d42122f

…firmware builds

pandafy requested changes Jan 21, 2022

View reviewed changes

nemesifier requested changes Jan 21, 2022

View reviewed changes

AbhigyaShridhar and others added 3 commits January 25, 2022 23:52

Merge branch 'openwisp:master' into 170-Remove-Builds-Restore

27f2064

[admin] Removing reversion support for FirmwareBuild openwisp#170

2ee5cb0

In admin.py, replaced BaseVersionAdmin from BaseAdmin, as a superclass for 'BuildAdmin', as it is no longer desired to add a recovery option for firmware builds and images Fixes openwisp#170

pandafy requested changes Feb 15, 2022

View reviewed changes

pandafy reviewed Feb 15, 2022

View reviewed changes

pandafy added this to In progress in OpenWISP Priorities for next releases via automation Feb 15, 2022

pandafy changed the title ~~removed reversion dependency to remove build recovery~~ [change] Removed support for restoring FirmwareBuild objects Feb 15, 2022

AbhigyaShridhar and others added 2 commits February 16, 2022 00:50

[fix] Fixed failing tests

ec18fc2

pandafy reviewed Feb 16, 2022

View reviewed changes

Merge branch 'openwisp:master' into 170-Remove-Builds-Restore

7eb3384

pandafy requested changes Feb 22, 2022

View reviewed changes

[change] Removed support for restoring FirmwareBuild objects openwisp…

af336f3

…#173 Removed an extra comment, also did some minor formating to make sure all checks in ./run-qa-checks work fixes openwisp#173

pandafy approved these changes Feb 23, 2022

View reviewed changes

pandafy moved this from In progress to Ready for review/testing in OpenWISP Priorities for next releases Feb 23, 2022

OpenWISP Priorities for next releases automation moved this from Ready for review/testing to Reviewer approved Feb 23, 2022

nemesifier approved these changes Feb 23, 2022

View reviewed changes

nemesifier merged commit 999b17e into openwisp:master Feb 23, 2022

OpenWISP Priorities for next releases automation moved this from Reviewer approved to Done Feb 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[change] Removed support for restoring FirmwareBuild objects #173

[change] Removed support for restoring FirmwareBuild objects #173

AbhigyaShridhar commented Jan 21, 2022

pandafy left a comment

nemesifier left a comment

pandafy left a comment •

edited

pandafy Feb 15, 2022

pandafy Feb 22, 2022

AbhigyaShridhar Feb 22, 2022

pandafy Feb 23, 2022

pandafy Feb 15, 2022 •

edited by nemesifier

pandafy Feb 15, 2022

pandafy Feb 16, 2022

pandafy left a comment

pandafy Feb 22, 2022

pandafy left a comment

nemesifier left a comment

	def reversion_register(self, model, **kwargs):
	if model == Category:
	kwargs['follow'] = (*kwargs['follow'], 'build_set')
	return super().reversion_register(model, **kwargs)

[change] Removed support for restoring FirmwareBuild objects #173

[change] Removed support for restoring FirmwareBuild objects #173

Conversation

AbhigyaShridhar commented Jan 21, 2022

pandafy left a comment

Choose a reason for hiding this comment

nemesifier left a comment

Choose a reason for hiding this comment

pandafy left a comment • edited

Choose a reason for hiding this comment

pandafy Feb 15, 2022

Choose a reason for hiding this comment

pandafy Feb 22, 2022

Choose a reason for hiding this comment

AbhigyaShridhar Feb 22, 2022

Choose a reason for hiding this comment

pandafy Feb 23, 2022

Choose a reason for hiding this comment

pandafy Feb 15, 2022 • edited by nemesifier

Choose a reason for hiding this comment

pandafy Feb 15, 2022

Choose a reason for hiding this comment

pandafy Feb 16, 2022

Choose a reason for hiding this comment

pandafy left a comment

Choose a reason for hiding this comment

pandafy Feb 22, 2022

Choose a reason for hiding this comment

pandafy left a comment

Choose a reason for hiding this comment

nemesifier left a comment

Choose a reason for hiding this comment

pandafy left a comment •

edited

pandafy Feb 15, 2022 •

edited by nemesifier