From 702c47cbeb134840ed760c7175f09751e1b14b4d Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Mon, 5 Aug 2013 02:13:22 +0400 Subject: [PATCH] Clean up session in db.sqla.api.get_ec2 methods Remove session parameter from public methods get_ec2_volume_id_by_uuid get_volume_uuid_by_ec2_id get_ec2_snapshot_id_by_uuid get_snapshot_uuid_by_ec2_id get_ec2_instance_id_by_uuid get_instance_uuid_by_ec2_id Because they are never called with session parameter we could just remove it. blueprint db-session-cleanup Change-Id: Iecced3cf144de4f58a1169ed2d8f6940e229bedb --- nova/db/sqlalchemy/api.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 5cdfa1a16e2a..323187ff485b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3222,8 +3222,8 @@ def ec2_volume_create(context, volume_uuid, id=None): @require_context -def get_ec2_volume_id_by_uuid(context, volume_id, session=None): - result = _ec2_volume_get_query(context, session=session).\ +def get_ec2_volume_id_by_uuid(context, volume_id): + result = _ec2_volume_get_query(context).\ filter_by(uuid=volume_id).\ first() @@ -3234,8 +3234,8 @@ def get_ec2_volume_id_by_uuid(context, volume_id, session=None): @require_context -def get_volume_uuid_by_ec2_id(context, ec2_id, session=None): - result = _ec2_volume_get_query(context, session=session).\ +def get_volume_uuid_by_ec2_id(context, ec2_id): + result = _ec2_volume_get_query(context).\ filter_by(id=ec2_id).\ first() @@ -3259,8 +3259,8 @@ def ec2_snapshot_create(context, snapshot_uuid, id=None): @require_context -def get_ec2_snapshot_id_by_uuid(context, snapshot_id, session=None): - result = _ec2_snapshot_get_query(context, session=session).\ +def get_ec2_snapshot_id_by_uuid(context, snapshot_id): + result = _ec2_snapshot_get_query(context).\ filter_by(uuid=snapshot_id).\ first() @@ -3271,8 +3271,8 @@ def get_ec2_snapshot_id_by_uuid(context, snapshot_id, session=None): @require_context -def get_snapshot_uuid_by_ec2_id(context, ec2_id, session=None): - result = _ec2_snapshot_get_query(context, session=session).\ +def get_snapshot_uuid_by_ec2_id(context, ec2_id): + result = _ec2_snapshot_get_query(context).\ filter_by(id=ec2_id).\ first() @@ -5192,9 +5192,8 @@ def ec2_instance_create(context, instance_uuid, id=None): @require_context -def get_ec2_instance_id_by_uuid(context, instance_id, session=None): - result = _ec2_instance_get_query(context, - session=session).\ +def get_ec2_instance_id_by_uuid(context, instance_id): + result = _ec2_instance_get_query(context).\ filter_by(uuid=instance_id).\ first() @@ -5205,9 +5204,8 @@ def get_ec2_instance_id_by_uuid(context, instance_id, session=None): @require_context -def get_instance_uuid_by_ec2_id(context, ec2_id, session=None): - result = _ec2_instance_get_query(context, - session=session).\ +def get_instance_uuid_by_ec2_id(context, ec2_id): + result = _ec2_instance_get_query(context).\ filter_by(id=ec2_id).\ first()