openstack/ovn-octavia-provider
Code Issues Proposed changes

Merge "Fix member subnet id on a fully populated LB" into stable/2024.1

Browse Source
This commit is contained in:
Zuul
2025-02-12 16:39:36 +00:00
committed by Gerrit Code Review
parent 9a182ec189 1716619185
commit da0b01e025
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ovn_octavia_provider/driver.py
View File

@@ -115,7 +115,7 @@ class OvnProviderDriver(driver_base.ProviderDriver):
self.pool_create(pool)
for member in pool.members:
if not member.subnet_id:
member.subnet_id = loadbalancer.vip_network_id
member.subnet_id = loadbalancer.vip_subnet_id
self.member_create(member)
def loadbalancer_delete(self, loadbalancer, cascade=False):

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

@@ -183,7 +183,8 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
name='favorite_lb0',
project_id=self.project_id,
vip_address=self.vip_address,
vip_network_id=self.vip_network_id)
vip_network_id=self.vip_network_id,
vip_subnet_id=self.vip_subnet_id)
self.ref_lb0 = data_models.LoadBalancer(
admin_state_up=False,
listeners=[self.ref_listener],
@@ -809,13 +810,13 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
'address': self.ref_member.address,
'protocol_port': self.ref_member.protocol_port,
'pool_id': self.ref_member.pool_id,
'subnet_id': self.ref_lb_fully_populated.vip_network_id,
'subnet_id': self.ref_lb_fully_populated.vip_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_lb_fully_populated.vip_network_id,
'subnet_id': self.ref_lb_fully_populated.vip_subnet_id,
'action': ovn_const.REQ_INFO_MEMBER_ADDED}
expected_lb_dict = {
'type': ovn_const.REQ_TYPE_LB_CREATE,