From cf2905b175064d432106a8555d87fb7da6dc3b01 Mon Sep 17 00:00:00 2001 From: Sergey Skripnick Date: Thu, 30 May 2013 10:55:44 +0300 Subject: Removed session from reservation_create() Removed session objects from public reservation_create() function in nova/db/sqlalchemy/api module. Minor code refactoring. blueprint db-session-cleanup Change-Id: Ib87dd407328b0208a92a7e50bf4117e85fc512fb --- nova/db/sqlalchemy/api.py | 9 ++++++++- nova/tests/test_quota.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 95cbb6efa..d7e821bc3 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2747,6 +2747,13 @@ def reservation_get(context, uuid): @require_admin_context def reservation_create(context, uuid, usage, project_id, resource, delta, + expire): + return _reservation_create(context, uuid, usage, project_id, + resource, delta, expire) + + +@require_admin_context +def _reservation_create(context, uuid, usage, project_id, resource, delta, expire, session=None): reservation_ref = models.Reservation() reservation_ref.uuid = uuid @@ -2875,7 +2882,7 @@ def quota_reserve(context, resources, quotas, deltas, expire, if not overs: reservations = [] for res, delta in deltas.items(): - reservation = reservation_create(elevated, + reservation = _reservation_create(elevated, str(uuid.uuid4()), usages[res], project_id, diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 30f823ace..8206de531 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -1475,7 +1475,7 @@ class QuotaReserveSqlAlchemyTestCase(test.TestCase): self.stubs.Set(sqa_api, 'get_session', fake_get_session) self.stubs.Set(sqa_api, '_get_quota_usages', fake_get_quota_usages) self.stubs.Set(sqa_api, '_quota_usage_create', fake_quota_usage_create) - self.stubs.Set(sqa_api, 'reservation_create', fake_reservation_create) + self.stubs.Set(sqa_api, '_reservation_create', fake_reservation_create) self.useFixture(test.TimeOverride()) -- cgit