From 5393254bcce9ec825631ced2e80bda827c63092e Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Mon, 19 Nov 2012 13:36:17 -0800 Subject: improve sessions for key_pair_(create,destroy) improve sessions for key_pair_(create,destroy) blueprint db-session-cleanup Change-Id: Ia26d9d3a96a5be0a6c475159426f5f8edfe5401e --- nova/db/sqlalchemy/api.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index c4558a84c..9a9369966 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1987,16 +1987,16 @@ def key_pair_create(context, values): @require_context def key_pair_destroy(context, user_id, name): authorize_user_context(context, user_id) - session = get_session() - with session.begin(): - key_pair_ref = key_pair_get(context, user_id, name, session=session) - key_pair_ref.delete(session=session) + model_query(context, models.KeyPair).\ + filter_by(user_id=user_id).\ + filter_by(name=name).\ + delete() @require_context -def key_pair_get(context, user_id, name, session=None): +def key_pair_get(context, user_id, name): authorize_user_context(context, user_id) - result = model_query(context, models.KeyPair, session=session).\ + result = model_query(context, models.KeyPair).\ filter_by(user_id=user_id).\ filter_by(name=name).\ first() -- cgit