From 741a4d8a88bbc51f5903fc00cc4f1decf8f4ea1a Mon Sep 17 00:00:00 2001 From: Dhuldev Valekar Date: Tue, 15 Jun 2021 07:10:12 -0500 Subject: [PATCH] Update the clear job id's constant Fixes an issue of powering off with the ``idrac-wsman`` management interface while the execution of a clear job queue cleaning step is proceeding. Prior to this fix, the clean step would fail when powering off a node. Story: 2008988 Task: 42641 Change-Id: Ib4ab755c806f028d97379b80a8c27d6ade63cba1 --- ironic/drivers/modules/drac/management.py | 2 +- ironic/tests/unit/drivers/modules/drac/test_management.py | 4 ++-- .../update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py index c7ab389d98..006357a081 100644 --- a/ironic/drivers/modules/drac/management.py +++ b/ironic/drivers/modules/drac/management.py @@ -88,7 +88,7 @@ _DRAC_BOOT_MODES = ['Bios', 'Uefi'] _NON_PERSISTENT_BOOT_MODE = 'OneTime' # Clear job id's constant -_CLEAR_JOB_IDS = 'JID_CLEARALL_FORCE' +_CLEAR_JOB_IDS = 'JID_CLEARALL' # Clean steps constant _CLEAR_JOBS_CLEAN_STEPS = ['clear_job_queue', 'known_good_state'] diff --git a/ironic/tests/unit/drivers/modules/drac/test_management.py b/ironic/tests/unit/drivers/modules/drac/test_management.py index b93c566545..a115d56d8c 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_management.py +++ b/ironic/tests/unit/drivers/modules/drac/test_management.py @@ -814,7 +814,7 @@ class DracManagementTestCase(test_utils.BaseDracTest): mock_client.reset_idrac.assert_called_once_with( force=True, wait=True) mock_client.delete_jobs.assert_called_once_with( - job_ids=['JID_CLEARALL_FORCE']) + job_ids=['JID_CLEARALL']) self.assertIsNone(return_value) @@ -826,7 +826,7 @@ class DracManagementTestCase(test_utils.BaseDracTest): shared=False) as task: return_value = task.driver.management.clear_job_queue(task) mock_client.delete_jobs.assert_called_once_with( - job_ids=['JID_CLEARALL_FORCE']) + job_ids=['JID_CLEARALL']) self.assertIsNone(return_value) diff --git a/releasenotes/notes/update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml b/releasenotes/notes/update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml new file mode 100644 index 0000000000..9ecaac9f2b --- /dev/null +++ b/releasenotes/notes/update-clear-job-id-constant-fix-c69cf96c55364bb3.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes an issue of powering off with the ``idrac-wsman`` management + interface while the execution of a clear job queue cleaning step is + proceeding. + Prior to this fix, the clean step would fail when powering off a node.