openstack
/
octavia
Code Issues Proposed changes

Merge "Optimize DB object to provider dict conversions" into stable/wallaby

This commit is contained in:
Zuul 2022-04-21 21:36:31 +00:00 committed by Gerrit Code Review
parent 7bee4bdbe3 82665fed71
commit d056a852a3
2 changed files with 33 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
octavia/controller/worker/v2/controller_worker.py
View File

@ -179,11 +179,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,
@ -208,11 +205,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,
@ -247,13 +241,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,
@ -289,15 +280,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}
@ -460,11 +446,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,
@ -495,11 +478,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,
@ -544,11 +524,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,
@ -581,11 +559,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,
@ -631,11 +606,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,
@ -655,13 +627,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,
@ -693,11 +662,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,

22
octavia/tests/unit/controller/worker/v2/test_controller_worker.py
View File

@ -284,7 +284,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.
@ -317,7 +317,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
@ -356,7 +356,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,
@ -394,7 +394,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(
@ -790,7 +790,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,
@ -830,7 +830,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(
@ -870,7 +870,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,
@ -921,7 +921,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,
@ -954,7 +954,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,
@ -987,7 +987,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,
@ -1019,7 +1019,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,