openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

[sqlalchemy-20] Add (still) missing DB context decorator 

This fixes one query still being executed without context decorator,
which is causing the warning messages.

Related-Bug: #1980671
Closes-Bug: #1984238
Change-Id: I3eba9c919e153dd253988fee31a7cebaf3cad773
This commit is contained in:
Takashi Kajinami 2022-08-11 00:34:30 +09:00
parent 2e7b595268
commit d98b177a26
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron_dynamic_routing/db/bgp_db.py
View File

@ -263,8 +263,9 @@ class BgpDbMixin(object):
return [self._make_bgp_peer_dict(x, fields) for x in query.all()]
def get_bgp_peer(self, context, bgp_peer_id, fields=None):
bgp_peer_db = self._get_bgp_peer(context, bgp_peer_id)
return self._make_bgp_peer_dict(bgp_peer_db, fields=fields)
with db_api.CONTEXT_READER.using(context):
bgp_peer_db = self._get_bgp_peer(context, bgp_peer_id)
return self._make_bgp_peer_dict(bgp_peer_db, fields=fields)
def delete_bgp_peer(self, context, bgp_peer_id):
with db_api.CONTEXT_WRITER.using(context):
@ -1080,11 +1081,13 @@ class BgpDbMixin(object):
'next_hop': y} for x, y in ip_next_hop_tuples)
def _get_router(self, context, router_id):
try:
router = model_query.get_by_id(context, l3_db.Router, router_id)
except sa_exc.NoResultFound:
raise l3_exc.RouterNotFound(router_id=router_id)
return router
with db_api.CONTEXT_READER.using(context):
try:
router = model_query.get_by_id(context, l3_db.Router,
router_id)
except sa_exc.NoResultFound:
raise l3_exc.RouterNotFound(router_id=router_id)
return router
def _get_fip_next_hop(self, context, router_id, ip_address=None):
router = self._get_router(context, router_id)