From b442b738b93e106787c87e5ebd841680548f75a5 Mon Sep 17 00:00:00 2001 From: James Peru Date: Mon, 24 Aug 2026 16:57:54 +0300 Subject: [PATCH] test: read and set nas.backup.incremental.enabled for the test zone nas.backup.incremental.enabled is a zone-scoped setting, but test_backup_recovery_nas.py read and updated it without a zoneid, so a zone override in the test environment would make the suite read the wrong value. Pass zoneid=cls.zone.id on the read and on both updates, as the other backup smoke tests do for zone-scoped settings. Noted by the Copilot review on the 4.22 backport (#13877). Signed-off-by: James Peru --- test/integration/smoke/test_backup_recovery_nas.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/smoke/test_backup_recovery_nas.py b/test/integration/smoke/test_backup_recovery_nas.py index 41aa82bd0857..96021b9edff8 100644 --- a/test/integration/smoke/test_backup_recovery_nas.py +++ b/test/integration/smoke/test_backup_recovery_nas.py @@ -56,7 +56,7 @@ def setUpClass(cls): # Check backup configuration values, set them to enable the nas provider backup_enabled_cfg = Configurations.list(cls.api_client, name='backup.framework.enabled') backup_provider_cfg = Configurations.list(cls.api_client, name='backup.framework.provider.plugin') - incremental_backup_enabled_cfg = Configurations.list(cls.api_client, name='nas.backup.incremental.enabled') + incremental_backup_enabled_cfg = Configurations.list(cls.api_client, name='nas.backup.incremental.enabled', zoneid=cls.zone.id) cls.backup_enabled = backup_enabled_cfg[0].value cls.backup_provider = backup_provider_cfg[0].value cls.incremental_backup_enabled = incremental_backup_enabled_cfg[0].value @@ -66,7 +66,7 @@ def setUpClass(cls): if cls.backup_provider != "nas": Configurations.update(cls.api_client, 'backup.framework.provider.plugin', value='nas') if cls.incremental_backup_enabled == "false": - Configurations.update(cls.api_client, 'nas.backup.incremental.enabled', value='true') + Configurations.update(cls.api_client, 'nas.backup.incremental.enabled', value='true', zoneid=cls.zone.id) cls.account = Account.create(cls.api_client, cls.services["account"], domainid=cls.domain.id) @@ -99,7 +99,7 @@ def tearDownClass(cls): if cls.backup_provider != "nas": Configurations.update(cls.api_client, 'backup.framework.provider.plugin', value=cls.backup_provider) if cls.incremental_backup_enabled == "false": - Configurations.update(cls.api_client, 'nas.backup.incremental.enabled', value="false") + Configurations.update(cls.api_client, 'nas.backup.incremental.enabled', value="false", zoneid=cls.zone.id) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e)