diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-15 06:41:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-15 06:41:40 +0000 |
| commit | 74c7ba3ba5c50f0b1ac660df3d5f416645a38e4d (patch) | |
| tree | 85f7cdafc89d4285b011ad1df7b34c32837e2f98 /nova | |
| parent | 898c260e84a4e3c002d9feacbc43293361185e6f (diff) | |
| parent | cf2905b175064d432106a8555d87fb7da6dc3b01 (diff) | |
| download | nova-74c7ba3ba5c50f0b1ac660df3d5f416645a38e4d.tar.gz nova-74c7ba3ba5c50f0b1ac660df3d5f416645a38e4d.tar.xz nova-74c7ba3ba5c50f0b1ac660df3d5f416645a38e4d.zip | |
Merge "Removed session from reservation_create()"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 9 | ||||
| -rw-r--r-- | 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 3160743ed..7b5cea4de 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2761,6 +2761,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 @@ -2889,7 +2896,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 c4c6b93ca..be3669958 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()) |