openstack/octavia
Code Issues Proposed changes

Merge "Fix HealthMonitorToErrorOnRevertTask revert method"

Browse Source
This commit is contained in:
Zuul
2022-07-08 11:09:23 +00:00
committed by Gerrit Code Review
parent b7730f51ea 96f2ca7cec
commit bdcd9d6aeb
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/controller/worker/v1/tasks/lifecycle_tasks.py
View File

@@ -52,7 +52,7 @@ class HealthMonitorToErrorOnRevertTask(BaseLifecycleTask):
pass pass
def revert(self, health_mon, listeners, loadbalancer, *args, **kwargs): 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_pool_prov_status_active(health_mon.pool_id)
self.task_utils.mark_loadbalancer_prov_status_active(loadbalancer.id) self.task_utils.mark_loadbalancer_prov_status_active(loadbalancer.id)
for listener in listeners: for listener in listeners:

2
octavia/controller/worker/v2/tasks/lifecycle_tasks.py
View File

@@ -55,7 +55,7 @@ class HealthMonitorToErrorOnRevertTask(BaseLifecycleTask):
def revert(self, health_mon, listeners, loadbalancer, *args, **kwargs): def revert(self, health_mon, listeners, loadbalancer, *args, **kwargs):
self.task_utils.mark_health_mon_prov_status_error( 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( self.task_utils.mark_pool_prov_status_active(
health_mon[constants.POOL_ID]) health_mon[constants.POOL_ID])
self.task_utils.mark_loadbalancer_prov_status_active( self.task_utils.mark_loadbalancer_prov_status_active(

2
octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py
View File

@@ -28,7 +28,7 @@ class TestLifecycleTasks(base.TestCase):
self.AMPHORA.id = self.AMPHORA_ID self.AMPHORA.id = self.AMPHORA_ID
self.HEALTH_MON = mock.MagicMock() self.HEALTH_MON = mock.MagicMock()
self.HEALTH_MON_ID = uuidutils.generate_uuid() 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 = mock.MagicMock()
self.L7POLICY_ID = uuidutils.generate_uuid() self.L7POLICY_ID = uuidutils.generate_uuid()
self.L7POLICY.id = self.L7POLICY_ID self.L7POLICY.id = self.L7POLICY_ID

2
octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py
View File

@@ -126,7 +126,7 @@ class TestLifecycleTasks(base.TestCase):
self.LOADBALANCER) self.LOADBALANCER)
mock_health_mon_prov_status_error.assert_called_once_with( 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( mock_loadbalancer_prov_status_active.assert_called_once_with(
self.LOADBALANCER_ID) self.LOADBALANCER_ID)
mock_listener_prov_status_active.assert_called_once_with( mock_listener_prov_status_active.assert_called_once_with(

6
releasenotes/notes/fix-health-monitor-to-error-revert-task-feb38ba7641a4892.yaml Normal file
View File

@@ -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.