diff --git a/octavia/controller/worker/v2/controller_worker.py b/octavia/controller/worker/v2/controller_worker.py index b756b356ee..8ec5843628 100644 --- a/octavia/controller/worker/v2/controller_worker.py +++ b/octavia/controller/worker/v2/controller_worker.py @@ -149,11 +149,8 @@ class ControllerWorker(object): pool.health_monitor = db_health_monitor load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.HEALTH_MON: health_monitor, constants.POOL_ID: pool.id, @@ -178,11 +175,8 @@ class ControllerWorker(object): pool = db_health_monitor.pool load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.HEALTH_MON: health_monitor, constants.POOL_ID: pool.id, @@ -217,13 +211,10 @@ class ControllerWorker(object): pool = db_health_monitor.pool - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) - load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.HEALTH_MON: original_health_monitor, constants.POOL_ID: pool.id, @@ -259,15 +250,10 @@ class ControllerWorker(object): raise db_exceptions.NoResultFound load_balancer = db_listener.load_balancer - listeners = load_balancer.listeners - dict_listeners = [] - for li in listeners: - dict_listeners.append( - provider_utils.db_listener_to_provider_listener(li).to_dict()) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() + load_balancer).to_dict(recurse=True) - store = {constants.LISTENERS: dict_listeners, + store = {constants.LISTENERS: provider_lb['listeners'], constants.LOADBALANCER: provider_lb, constants.LOADBALANCER_ID: load_balancer.id} @@ -429,11 +415,8 @@ class ControllerWorker(object): pool = db_member.pool load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = { constants.MEMBER: member, @@ -464,11 +447,8 @@ class ControllerWorker(object): load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = { constants.MEMBER: member, @@ -513,11 +493,9 @@ class ControllerWorker(object): id=updated_members[0][0][constants.POOL_ID]) load_balancer = pool.load_balancer - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = { constants.LISTENERS: listeners_dicts, @@ -550,11 +528,8 @@ class ControllerWorker(object): id=member[constants.POOL_ID]) load_balancer = pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = { constants.MEMBER: member, constants.LISTENERS: listeners_dicts, @@ -600,11 +575,8 @@ class ControllerWorker(object): load_balancer = db_pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - db_pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.POOL_ID: pool[constants.POOL_ID], constants.LISTENERS: listeners_dicts, @@ -624,13 +596,10 @@ class ControllerWorker(object): db_pool = self._pool_repo.get(db_apis.get_session(), id=pool[constants.POOL_ID]) - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - db_pool.listeners)) load_balancer = db_pool.load_balancer - provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.POOL_ID: pool[constants.POOL_ID], constants.LISTENERS: listeners_dicts, @@ -662,11 +631,8 @@ class ControllerWorker(object): load_balancer = db_pool.load_balancer provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - load_balancer).to_dict() - - listeners_dicts = ( - provider_utils.db_listeners_to_provider_dicts_list_of_dicts( - db_pool.listeners)) + load_balancer).to_dict(recurse=True) + listeners_dicts = provider_lb.get('listeners', []) store = {constants.POOL_ID: db_pool.id, constants.LISTENERS: listeners_dicts, diff --git a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py index 1562e7de1e..e03d483362 100644 --- a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py +++ b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py @@ -256,7 +256,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.create_health_monitor(_health_mon_mock) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) mock_health_mon_repo_get.return_value = _db_health_mon_mock (cw.services_controller.run_poster. @@ -289,7 +289,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) cw.delete_health_monitor(_health_mon_mock) mock_health_mon_repo_get.return_value = _db_health_mon_mock @@ -328,7 +328,7 @@ class TestControllerWorker(base.TestCase): cw.update_health_monitor(_health_mon_mock, HEALTH_UPDATE_DICT) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_update_health_monitor_flow, @@ -366,7 +366,7 @@ class TestControllerWorker(base.TestCase): constants.PROJECT_ID: PROJECT_ID} cw.create_listener(listener_dict) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with( @@ -762,7 +762,7 @@ class TestControllerWorker(base.TestCase): cw.create_member(_member) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_create_member_flow, store={constants.MEMBER: _member, @@ -802,7 +802,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.delete_member(_member) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with( @@ -842,7 +842,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.update_member(_member, MEMBER_UPDATE_DICT) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_update_member_flow, store={constants.MEMBER: _member, @@ -893,7 +893,7 @@ class TestControllerWorker(base.TestCase): old_provider_m = provider_utils.db_member_to_provider_member( old_member).to_dict() provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with( flow_utils.get_batch_update_members_flow, @@ -926,7 +926,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.create_pool(_pool_mock) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_create_pool_flow, @@ -959,7 +959,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.delete_pool(_pool_mock) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_delete_pool_flow, store={constants.POOL_ID: POOL_ID, @@ -991,7 +991,7 @@ class TestControllerWorker(base.TestCase): cw = controller_worker.ControllerWorker() cw.update_pool(_pool_mock, POOL_UPDATE_DICT) provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer( - _db_load_balancer_mock).to_dict() + _db_load_balancer_mock).to_dict(recurse=True) (cw.services_controller.run_poster. assert_called_once_with(flow_utils.get_update_pool_flow, store={constants.POOL_ID: POOL_ID,