openstack
/
ovn-octavia-provider
Code Issues Proposed changes

Check if no members in pool better in batch update 

member_batch_update() might find a loadbalancer with
a pool that contains no members, but calling split(',')
will result in an existing member list of ['']. Force
it to an empty list if there are no members.

Closes-Bug: #1912779
Change-Id: Iec46c3e1ebef822d43964e13962153dc8760ee42
(cherry picked from commit 6e30b8552c)
This commit is contained in:
Michał Nasiadka 2021-01-22 13:36:54 +01:00 committed by Michal Nasiadka
parent 674203b4bf
commit d96296752d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ovn_octavia_provider/driver.py
View File

@ -292,7 +292,8 @@ class OvnProviderDriver(driver_base.ProviderDriver):
skipped_members = [] skipped_members = []
pool_key, ovn_lb = self._ovn_helper._find_ovn_lb_by_pool_id(pool_id) pool_key, ovn_lb = self._ovn_helper._find_ovn_lb_by_pool_id(pool_id)
external_ids = copy.deepcopy(ovn_lb.external_ids) external_ids = copy.deepcopy(ovn_lb.external_ids)
existing_members = external_ids[pool_key].split(',') pool = external_ids[pool_key]
existing_members = pool.split(',') if pool else []
members_to_delete = copy.copy(existing_members) members_to_delete = copy.copy(existing_members)
for member in members: for member in members:
if (self._check_monitor_options(member) or if (self._check_monitor_options(member) or

10
ovn_octavia_provider/tests/unit/test_driver.py
View File

@ -11,6 +11,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
import copy
from unittest import mock from unittest import mock
from octavia_lib.api.drivers import data_models from octavia_lib.api.drivers import data_models
@ -289,6 +290,15 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
[self.ref_member, self.update_member]) [self.ref_member, self.update_member])
self.assertEqual(self.mock_add_request.call_count, 3) self.assertEqual(self.mock_add_request.call_count, 3)
def test_member_batch_update_no_members(self):
pool_key = 'pool_%s' % self.pool_id
ovn_lb = copy.copy(self.ovn_lb)
ovn_lb.external_ids[pool_key] = []
self.mock_find_lb_pool_key.return_value = ovn_lb
self.driver.member_batch_update(self.pool_id,
[self.ref_member, self.update_member])
self.assertEqual(self.mock_add_request.call_count, 2)
def test_member_batch_update_skipped_monitor(self): def test_member_batch_update_skipped_monitor(self):
self.ref_member.monitor_address = '10.11.1.1' self.ref_member.monitor_address = '10.11.1.1'
self.assertRaises(exceptions.UnsupportedOptionError, self.assertRaises(exceptions.UnsupportedOptionError,