openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Ensure provider information is used when finding lbs"

Browse Source
This commit is contained in:
Zuul 2020-06-03 12:35:07 +00:00 committed by Gerrit Code Review
commit 9e3076f36a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kuryr_kubernetes/controller/drivers/lbaasv2.py
View File

@ -491,7 +491,8 @@ class LBaaSv2Driver(base.LBaaSDriver):
name=loadbalancer.name,
project_id=loadbalancer.project_id,
vip_address=str(loadbalancer.ip),
vip_subnet_id=loadbalancer.subnet_id)
vip_subnet_id=loadbalancer.subnet_id,
provider=loadbalancer.provider)
try:
os_lb = next(response) # openstacksdk returns a generator

9
kuryr_kubernetes/tests/unit/controller/drivers/test_lbaasv2.py
View File

@ -422,7 +422,8 @@ class TestLBaaSv2Driver(test_base.TestCase):
name=loadbalancer.name,
project_id=loadbalancer.project_id,
vip_address=str(loadbalancer.ip),
vip_subnet_id=loadbalancer.subnet_id)
vip_subnet_id=loadbalancer.subnet_id,
provider='haproxy')
for attr in loadbalancer.obj_fields:
self.assertEqual(getattr(loadbalancer, attr),
getattr(ret, attr))
@ -444,7 +445,8 @@ class TestLBaaSv2Driver(test_base.TestCase):
name=loadbalancer.name,
project_id=loadbalancer.project_id,
vip_address=str(loadbalancer.ip),
vip_subnet_id=loadbalancer.subnet_id)
vip_subnet_id=loadbalancer.subnet_id,
provider=None)
self.assertIsNone(ret)
m_driver.release_loadbalancer.assert_not_called()
@ -467,7 +469,8 @@ class TestLBaaSv2Driver(test_base.TestCase):
name=loadbalancer.name,
project_id=loadbalancer.project_id,
vip_address=str(loadbalancer.ip),
vip_subnet_id=loadbalancer.subnet_id)
vip_subnet_id=loadbalancer.subnet_id,
provider=None)
self.assertIsNone(ret)
m_driver.release_loadbalancer.assert_called_once()