diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-14 02:05:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-14 02:05:18 +0000 |
| commit | ebff2030cccc6e59717fc4a689ca3ab461a08374 (patch) | |
| tree | 455f6c3d463a1f86a47852db05b58bf454366e5d | |
| parent | 7e5ea88e7a80bf7f542e1614cd8ee22592e35eb9 (diff) | |
| parent | cef34cd69156036c855ec217225edfce65b63d3c (diff) | |
| download | nova-ebff2030cccc6e59717fc4a689ca3ab461a08374.tar.gz nova-ebff2030cccc6e59717fc4a689ca3ab461a08374.tar.xz nova-ebff2030cccc6e59717fc4a689ca3ab461a08374.zip | |
Merge "Remove sqlalchemy calling back to DB API"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ba8595186..68657ffb4 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -121,7 +121,7 @@ def require_instance_exists_using_uuid(f): """ @functools.wraps(f) def wrapper(context, instance_uuid, *args, **kwargs): - db.instance_get_by_uuid(context, instance_uuid) + instance_get_by_uuid(context, instance_uuid) return f(context, instance_uuid, *args, **kwargs) return wrapper @@ -136,7 +136,7 @@ def require_aggregate_exists(f): @functools.wraps(f) def wrapper(context, aggregate_id, *args, **kwargs): - db.aggregate_get(context, aggregate_id) + aggregate_get(context, aggregate_id) return f(context, aggregate_id, *args, **kwargs) return wrapper @@ -1437,7 +1437,7 @@ def instance_create(context, values): instance_ref.save(session=session) # create the instance uuid to ec2_id mapping entry for instance - db.ec2_instance_create(context, instance_ref['uuid']) + ec2_instance_create(context, instance_ref['uuid']) return instance_ref |