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

This commit is contained in:
Zuul 2022-08-16 09:40:23 +00:00 committed by Gerrit Code Review
commit 4583487487

View File

@ -263,6 +263,7 @@ 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):
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)
@ -1080,8 +1081,10 @@ class BgpDbMixin(object):
'next_hop': y} for x, y in ip_next_hop_tuples)
def _get_router(self, context, router_id):
with db_api.CONTEXT_READER.using(context):
try:
router = model_query.get_by_id(context, l3_db.Router, router_id)
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