Merge "Revert "Updated "create_pool" method in plugin""
This commit is contained in:
commit
5617616416
@ -671,8 +671,8 @@ class LoadBalancerPluginDbv2(agent_scheduler.LbaasAgentSchedulerDbMixin):
|
|||||||
pool_db.session_persistence = s_p
|
pool_db.session_persistence = s_p
|
||||||
|
|
||||||
context.session.add(pool_db)
|
context.session.add(pool_db)
|
||||||
context.session.flush()
|
context.session.refresh(pool_db.loadbalancer)
|
||||||
return data_models.Pool.from_sqlalchemy_model(pool_db)
|
return self.get_pool(context, pool_db.id)
|
||||||
|
|
||||||
def update_pool(self, context, id, pool):
|
def update_pool(self, context, id, pool):
|
||||||
with context.session.begin(subtransactions=True):
|
with context.session.begin(subtransactions=True):
|
||||||
|
@ -710,9 +710,9 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2,
|
|||||||
self.db.update_loadbalancer_provisioning_status(
|
self.db.update_loadbalancer_provisioning_status(
|
||||||
context, db_pool.loadbalancer_id)
|
context, db_pool.loadbalancer_id)
|
||||||
raise exc
|
raise exc
|
||||||
|
# Reload the pool from the DB to re-populate pool.listeners
|
||||||
db_pool.listeners = self.db.get_listeners(
|
# before calling the driver
|
||||||
context, filters={'default_pool_id': [db_pool.id]})
|
db_pool = self.db.get_pool(context, db_pool.id)
|
||||||
driver = self._get_driver_for_loadbalancer(
|
driver = self._get_driver_for_loadbalancer(
|
||||||
context, db_pool.loadbalancer_id)
|
context, db_pool.loadbalancer_id)
|
||||||
self._call_driver_operation(context, driver.pool.create, db_pool)
|
self._call_driver_operation(context, driver.pool.create, db_pool)
|
||||||
|
Loading…
Reference in New Issue
Block a user