diff --git a/octavia/controller/worker/v1/tasks/lifecycle_tasks.py b/octavia/controller/worker/v1/tasks/lifecycle_tasks.py index d46e462fae..41b8288ba3 100644 --- a/octavia/controller/worker/v1/tasks/lifecycle_tasks.py +++ b/octavia/controller/worker/v1/tasks/lifecycle_tasks.py @@ -52,7 +52,7 @@ class HealthMonitorToErrorOnRevertTask(BaseLifecycleTask): pass def revert(self, health_mon, listeners, loadbalancer, *args, **kwargs): - self.task_utils.mark_health_mon_prov_status_error(health_mon.pool_id) + self.task_utils.mark_health_mon_prov_status_error(health_mon.id) self.task_utils.mark_pool_prov_status_active(health_mon.pool_id) self.task_utils.mark_loadbalancer_prov_status_active(loadbalancer.id) for listener in listeners: diff --git a/octavia/controller/worker/v2/tasks/lifecycle_tasks.py b/octavia/controller/worker/v2/tasks/lifecycle_tasks.py index db521291e8..8e1ad46ea0 100644 --- a/octavia/controller/worker/v2/tasks/lifecycle_tasks.py +++ b/octavia/controller/worker/v2/tasks/lifecycle_tasks.py @@ -55,7 +55,7 @@ class HealthMonitorToErrorOnRevertTask(BaseLifecycleTask): def revert(self, health_mon, listeners, loadbalancer, *args, **kwargs): self.task_utils.mark_health_mon_prov_status_error( - health_mon[constants.POOL_ID]) + health_mon[constants.HEALTHMONITOR_ID]) self.task_utils.mark_pool_prov_status_active( health_mon[constants.POOL_ID]) self.task_utils.mark_loadbalancer_prov_status_active( diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py index 82348db9ad..a766e619ac 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py @@ -28,7 +28,7 @@ class TestLifecycleTasks(base.TestCase): self.AMPHORA.id = self.AMPHORA_ID self.HEALTH_MON = mock.MagicMock() self.HEALTH_MON_ID = uuidutils.generate_uuid() - self.HEALTH_MON.pool_id = self.HEALTH_MON_ID + self.HEALTH_MON.id = self.HEALTH_MON_ID self.L7POLICY = mock.MagicMock() self.L7POLICY_ID = uuidutils.generate_uuid() self.L7POLICY.id = self.L7POLICY_ID diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py index cbeb54663a..7c14f6fbe5 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py @@ -126,7 +126,7 @@ class TestLifecycleTasks(base.TestCase): self.LOADBALANCER) mock_health_mon_prov_status_error.assert_called_once_with( - self.POOL_ID) + self.HEALTH_MON_ID) mock_loadbalancer_prov_status_active.assert_called_once_with( self.LOADBALANCER_ID) mock_listener_prov_status_active.assert_called_once_with( diff --git a/releasenotes/notes/fix-health-monitor-to-error-revert-task-feb38ba7641a4892.yaml b/releasenotes/notes/fix-health-monitor-to-error-revert-task-feb38ba7641a4892.yaml new file mode 100644 index 0000000000..2ff75aa5fb --- /dev/null +++ b/releasenotes/notes/fix-health-monitor-to-error-revert-task-feb38ba7641a4892.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix a bug that prevented the provisioning_state of a health-monitor to be + set to ERROR when an error occurred while creating, updating or deleting a + health-monitor. \ No newline at end of file