diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-02-05 18:12:02 -0800 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-02-08 12:15:46 -0800 |
| commit | 6ff32210772a67a1b526d9d784030afc90f3ce99 (patch) | |
| tree | 19532173de03e64507b64c289c2e680b81bb5e26 /nova/compute | |
| parent | daddc54befea4414776368b0ae8f689872b21e27 (diff) | |
Use joined version of db.api calls
Replace db.instance_get_active_by_window with
db.instance_get_active_by_window_joined
Remove db.instance_get_active_by_window as it is now unused
When moving over to nova.db.api not returning sqlalchemy
objects non-joined db calls (lazy loaded) won't work.
Partially implements bp db-api-cleanup
Change-Id: Iec647792a049d53862a45f95accd7f46e483aa17
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 394f09e11..47d122eaa 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1250,8 +1250,8 @@ class API(base.Base): # search_opts in get_all def get_active_by_window(self, context, begin, end=None, project_id=None): """Get instances that were continuously active over a window.""" - return self.db.instance_get_active_by_window(context, begin, end, - project_id) + return self.db.instance_get_active_by_window_joined(context, begin, + end, project_id) #NOTE(bcwaldon): this doesn't really belong in this class def get_instance_type(self, context, instance_type_id): |