openstack/ovn-octavia-provider
Code Issues Proposed changes

Add support for fullypopulated load balancers

Browse Source 
Octavia API allows to create fully populated load balancers with
a single call. OVN-octavia-provider was not implementing this option
and only the loadbalancer was created, living the listener(s),
pool(s), and member(s) created by the Octavia API as PENDING_CREATE.
This also generated leftovers when trying to delete the loadbalancer
with the --cascade option.

Closes-Bug: #1958964
(cherry picked from commit 6cc77f8a22084d610bdc071c8aab36615f0a6a0b)

Upstream-Wallaby: https://review.opendev.org/c/openstack/ovn-octavia-provider/+/827694
Upstream-Xena: https://review.opendev.org/c/openstack/ovn-octavia-provider/+/827689

Change-Id: I07c792c5785f978e7dde238aa3971b87d220a8eb
This commit is contained in:
Fernando Royo 2022-01-25 09:04:19 +00:00
parent c1345ced65
commit eb4d664155
2 changed files with 87 additions and 7 deletions
ovn_octavia_provider
driver.py
tests/unit
test_driver.py

13
ovn_octavia_provider/driver.py

@ -81,6 +81,18 @@ class OvnProviderDriver(driver_base.ProviderDriver):
'info': request_info}
self._ovn_helper.add_request(request)
if not isinstance(loadbalancer.listeners, o_datamodels.UnsetType):
for listener in loadbalancer.listeners:
self.listener_create(listener)
if not isinstance(loadbalancer.pools, o_datamodels.UnsetType):
for pool in loadbalancer.pools:
self.pool_create(pool)
for member in pool.members:
if not member.subnet_id:
member.subnet_id = loadbalancer.vip_network_id
self.member_create(member)
def loadbalancer_delete(self, loadbalancer, cascade=False):
request_info = {'id': loadbalancer.loadbalancer_id,
'cascade': cascade}
@ -149,7 +161,6 @@ class OvnProviderDriver(driver_base.ProviderDriver):
def listener_create(self, listener):
self._check_for_supported_protocols(listener.protocol)
self._check_for_allowed_cidrs(listener.allowed_cidrs)
admin_state_up = listener.admin_state_up
if isinstance(admin_state_up, o_datamodels.UnsetType):
admin_state_up = True

81
ovn_octavia_provider/tests/unit/test_driver.py

@ -153,6 +153,15 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
name='listener',
protocol='http',
protocol_port=42)
self.ref_lb_fully_populated = data_models.LoadBalancer(
admin_state_up=False,
listeners=[self.ref_listener],
pools=[self.ref_pool],
loadbalancer_id=self.loadbalancer_id,
name='favorite_lb0',
project_id=self.project_id,
vip_address=self.vip_address,
vip_network_id=self.vip_network_id)
self.ref_lb0 = data_models.LoadBalancer(
admin_state_up=False,
listeners=[self.ref_listener],
@ -429,15 +438,73 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
self.driver.listener_delete(self.ref_listener)
self.mock_add_request.assert_called_once_with(expected_dict)
def test_loadbalancer_fully_populate_create(self):
info = {
'id': self.ref_lb_fully_populated.loadbalancer_id,
'vip_address': self.ref_lb_fully_populated.vip_address,
'vip_network_id': self.ref_lb_fully_populated.vip_network_id,
'admin_state_up': self.ref_lb_fully_populated.admin_state_up}
info_listener = {
'id': self.ref_listener.listener_id,
'protocol': self.ref_listener.protocol,
'protocol_port': self.ref_listener.protocol_port,
'default_pool_id': self.ref_listener.default_pool_id,
'admin_state_up': self.ref_listener.admin_state_up,
'loadbalancer_id': self.ref_listener.loadbalancer_id}
info_pool = {
'id': self.ref_pool.pool_id,
'loadbalancer_id': self.ref_pool.loadbalancer_id,
'listener_id': self.ref_pool.listener_id,
'protocol': self.ref_pool.protocol,
'lb_algorithm': constants.LB_ALGORITHM_SOURCE_IP_PORT,
'admin_state_up': self.ref_pool.admin_state_up}
info_member = {
'id': self.ref_member.member_id,
'address': self.ref_member.address,
'protocol_port': self.ref_member.protocol_port,
'pool_id': self.ref_member.pool_id,
'subnet_id': self.ref_member.subnet_id,
'admin_state_up': self.ref_member.admin_state_up}
info_dvr = {
'id': self.ref_member.member_id,
'address': self.ref_member.address,
'pool_id': self.ref_member.pool_id,
'subnet_id': self.ref_member.subnet_id,
'action': ovn_const.REQ_INFO_MEMBER_ADDED}
expected_lb_dict = {
'type': ovn_const.REQ_TYPE_LB_CREATE,
'info': info}
expected_listener_dict = {
'type': ovn_const.REQ_TYPE_LISTENER_CREATE,
'info': info_listener}
expected_pool_dict = {
'type': ovn_const.REQ_TYPE_POOL_CREATE,
'info': info_pool}
expected_member_dict = {
'type': ovn_const.REQ_TYPE_MEMBER_CREATE,
'info': info_member}
expected_dict_dvr = {
'type': ovn_const.REQ_TYPE_HANDLE_MEMBER_DVR,
'info': info_dvr}
calls = [mock.call(expected_lb_dict),
mock.call(expected_listener_dict),
mock.call(expected_pool_dict),
mock.call(expected_member_dict),
mock.call(expected_dict_dvr)]
self.driver.loadbalancer_create(self.ref_lb_fully_populated)
self.mock_add_request.assert_has_calls(calls)
def test_loadbalancer_create(self):
info = {'id': self.ref_lb0.loadbalancer_id,
'vip_address': self.ref_lb0.vip_address,
'vip_network_id': self.ref_lb0.vip_network_id,
'admin_state_up': self.ref_lb0.admin_state_up}
expected_dict = {'type': ovn_const.REQ_TYPE_LB_CREATE,
'info': info}
expected_dict = {
'type': ovn_const.REQ_TYPE_LB_CREATE,
'info': info}
calls = [mock.call(expected_dict)]
self.driver.loadbalancer_create(self.ref_lb0)
self.mock_add_request.assert_called_once_with(expected_dict)
self.mock_add_request.assert_has_calls(calls)
def test_loadbalancer_create_unset_admin_state_up(self):
self.ref_lb0.admin_state_up = data_models.UnsetType()
@ -445,10 +512,12 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
'vip_address': self.ref_lb0.vip_address,
'vip_network_id': self.ref_lb0.vip_network_id,
'admin_state_up': True}
expected_dict = {'type': ovn_const.REQ_TYPE_LB_CREATE,
'info': info}
expected_dict = {
'type': ovn_const.REQ_TYPE_LB_CREATE,
'info': info}
calls = [mock.call(expected_dict)]
self.driver.loadbalancer_create(self.ref_lb0)
self.mock_add_request.assert_called_once_with(expected_dict)
self.mock_add_request.assert_has_calls(calls)
def test_loadbalancer_update(self):
info = {'id': self.ref_lb1.loadbalancer_id,