Merge "improve sessions for reservation"

1 files changed, 8 insertions, 7 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 44650d4a4..e7989964c 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2502,9 +2502,8 @@ def quota_usage_update(context, project_id, resource, **kwargs):
 
 
 @require_context
-def reservation_get(context, uuid, session=None):
-    result = model_query(context, models.Reservation, session=session,
-                         read_deleted="no").\
+def reservation_get(context, uuid):
+    result = model_query(context, models.Reservation, read_deleted="no").\
                      filter_by(uuid=uuid).\
                      first()
 
@@ -2530,10 +2529,12 @@ def reservation_create(context, uuid, usage, project_id, resource, delta,
 
 @require_admin_context
 def reservation_destroy(context, uuid):
-    session = get_session()
-    with session.begin():
-        reservation_ref = reservation_get(context, uuid, session=session)
-        reservation_ref.delete(session=session)
+    result = model_query(context, models.Reservation, read_deleted="no").\
+                     filter_by(uuid=uuid).\
+                     delete()
+
+    if not result:
+        raise exception.ReservationNotFound(uuid=uuid)
 
 
 ###################