Ensure provider information is used when finding lbs
Change-Id: I4b5b78f4667b0829c270809b518a765f290bf13d Closes-Bug: 1881561
This commit is contained in:
parent
3795b84f59
commit
a6ee78931b
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue