openstack
/
neutron-lbaas
Code Issues Proposed changes

Revert "Updated "create_pool" method in plugin" 

This reverts commit c672b0d567.

Closes-Bug: #1802438
Change-Id: I21a068b73e366ea5c815ea14249cd3b3c6725315
This commit is contained in:
YAMAMOTO Takashi 2018-11-09 04:25:50 +00:00
parent c672b0d567
commit 31dc1e3a0e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py
View File

@ -664,8 +664,8 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin,
pool_db.session_persistence = s_p
context.session.add(pool_db)
context.session.flush()
return data_models.Pool.from_sqlalchemy_model(pool_db)
context.session.refresh(pool_db.loadbalancer)
return self.get_pool(context, pool_db.id)
def update_pool(self, context, id, pool):
with context.session.begin(subtransactions=True):

6
neutron_lbaas/services/loadbalancer/plugin.py
View File

@ -710,9 +710,9 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2,
self.db.update_loadbalancer_provisioning_status(
context, db_pool.loadbalancer_id)
raise exc
db_pool.listeners = self.db.get_listeners(
context, filters={'default_pool_id': [db_pool.id]})
# Reload the pool from the DB to re-populate pool.listeners
# before calling the driver
db_pool = self.db.get_pool(context, db_pool.id)
driver = self._get_driver_for_loadbalancer(
context, db_pool.loadbalancer_id)
self._call_driver_operation(context, driver.pool.create, db_pool)