From 6ff32210772a67a1b526d9d784030afc90f3ce99 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 5 Feb 2013 18:12:02 -0800 Subject: 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 --- nova/compute/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') 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): -- cgit