summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-23 11:26:38 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-23 11:26:38 -0800
commit48d4054e093a2faccbd819de8e9e02c03d28cda0 (patch)
tree0287c65b667e7df2d3d61a4744d83e361056d978 /nova/api
parentd8611e324680d8514995d6c222ffd440595a87cf (diff)
downloadnova-48d4054e093a2faccbd819de8e9e02c03d28cda0.tar.gz
nova-48d4054e093a2faccbd819de8e9e02c03d28cda0.tar.xz
nova-48d4054e093a2faccbd819de8e9e02c03d28cda0.zip
fix for failing describe_instances test
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 1b96567eb..e219fb30c 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -675,7 +675,8 @@ class CloudController(object):
instances = []
for ec2_id in instance_id:
internal_id = ec2_id_to_id(ec2_id)
- instance = self.compute_api.get(context, internal_id)
+ instance = self.compute_api.get(context,
+ instance_id=internal_id)
instances.append(instance)
else:
instances = self.compute_api.get_all(context, **kwargs)