summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-22 23:21:01 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-22 23:21:01 -0800
commit943b863bef09a4e2b3de36c26a3fabbcc6093411 (patch)
treefe84a58d50ccd1dc006012fc654b2b1e0ea3fcc6 /nova/api
parentafcec00e9e05031e1e7c086ff75fb05cf97c412d (diff)
downloadnova-943b863bef09a4e2b3de36c26a3fabbcc6093411.tar.gz
nova-943b863bef09a4e2b3de36c26a3fabbcc6093411.tar.xz
nova-943b863bef09a4e2b3de36c26a3fabbcc6093411.zip
Lots of test fixing
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 882cdcfc9..99b6d5cb6 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -529,8 +529,9 @@ class CloudController(object):
def get_ajax_console(self, context, instance_id, **kwargs):
ec2_id = instance_id[0]
- internal_id = ec2_id_to_id(ec2_id)
- return self.compute_api.get_ajax_console(context, internal_id)
+ instance_id = ec2_id_to_id(ec2_id)
+ return self.compute_api.get_ajax_console(context,
+ instance_id=instance_id)
def describe_volumes(self, context, volume_id=None, **kwargs):
if volume_id: