summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-09-14 13:46:09 -0500
committerJason Koelker <jason@koelker.net>2011-09-14 13:46:09 -0500
commitaa4375c21a874fb619d38fb17c8026d083b73ffd (patch)
tree4a67a89cbae6ddd6f4cad0178298c93455c10a46
parent0a06f649f0ed18344fb9a8fb5d4c6fa1a3151554 (diff)
make sure we are grabbing out just the ids
-rw-r--r--nova/compute/api.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 8b73a8954..3b217a85e 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -932,9 +932,12 @@ class API(base.Base):
def _get_instances_by_filters(self, context, filters):
ip_instances = None
if 'ip6' in filters or 'ip' in filters:
- ids = self.network_api.get_instance_ids_by_ip_filter(context,
- filters)
- ip_instances = [self.db.instance_get(id) for id in ids]
+ res = self.network_api.get_instance_ids_by_ip_filter(context,
+ filters)
+ # NOTE(jkoelker) When this flips to using UUIDS the name
+ # needs to be updated accordingingly
+ ip_instances = [self.db.instance_get(r['instance_id']) \
+ for r in res]
return self.db.instance_get_all_by_filters(context, filters,
ip_instances)