openstack/ironic
Code Issues Proposed changes

Merge "CI: DB: Don't return inside of node get wrappers"

Browse Source
This commit is contained in:
Zuul 2023-05-21 02:51:46 +00:00 committed by Gerrit Code Review
commit 2afaf4d0a0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ironic/db/sqlalchemy/api.py
View File

@ -763,31 +763,34 @@ class Connection(api.Connection):
try: try:
query = _get_node_select() query = _get_node_select()
with _session_for_read() as session: with _session_for_read() as session:
return session.scalars( res = session.scalars(
query.filter_by(id=node_id).limit(1) query.filter_by(id=node_id).limit(1)
).unique().one() ).unique().one()
except NoResultFound: except NoResultFound:
raise exception.NodeNotFound(node=node_id) raise exception.NodeNotFound(node=node_id)
return res
def get_node_by_uuid(self, node_uuid): def get_node_by_uuid(self, node_uuid):
try: try:
query = _get_node_select() query = _get_node_select()
with _session_for_read() as session: with _session_for_read() as session:
return session.scalars( res = session.scalars(
query.filter_by(uuid=node_uuid).limit(1) query.filter_by(uuid=node_uuid).limit(1)
).unique().one() ).unique().one()
except NoResultFound: except NoResultFound:
raise exception.NodeNotFound(node=node_uuid) raise exception.NodeNotFound(node=node_uuid)
return res
def get_node_by_name(self, node_name): def get_node_by_name(self, node_name):
try: try:
query = _get_node_select() query = _get_node_select()
with _session_for_read() as session: with _session_for_read() as session:
return session.scalars( res = session.scalars(
query.filter_by(name=node_name).limit(1) query.filter_by(name=node_name).limit(1)
).unique().one() ).unique().one()
except NoResultFound: except NoResultFound:
raise exception.NodeNotFound(node=node_name) raise exception.NodeNotFound(node=node_name)
return res
def get_node_by_instance(self, instance): def get_node_by_instance(self, instance):
if not uuidutils.is_uuid_like(instance): if not uuidutils.is_uuid_like(instance):
@ -796,11 +799,12 @@ class Connection(api.Connection):
try: try:
query = _get_node_select() query = _get_node_select()
with _session_for_read() as session: with _session_for_read() as session:
return session.scalars( res = session.scalars(
query.filter_by(instance_uuid=instance).limit(1) query.filter_by(instance_uuid=instance).limit(1)
).unique().one() ).unique().one()
except NoResultFound: except NoResultFound:
raise exception.InstanceNotFound(instance_uuid=instance) raise exception.InstanceNotFound(instance_uuid=instance)
return res
@oslo_db_api.retry_on_deadlock @oslo_db_api.retry_on_deadlock
def destroy_node(self, node_id): def destroy_node(self, node_id):