summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-03-24 17:04:55 -0700
committerAnthony Young <sleepsonthefloor@gmail.com>2011-03-24 17:04:55 -0700
commitf2f08a5b0309876bb312c9124e75bd89331c4816 (patch)
treed934cad3a2f1201df6e778fabaf586b5fe7e698e /nova/api
parent1ca149a00788253a025b02602c5f0d317d6652a9 (diff)
make everything work with trunk again
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 6b08f98c2..eb0428c2c 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -538,7 +538,7 @@ class CloudController(object):
def get_vnc_console(self, context, instance_id, **kwargs):
ec2_id = instance_id
- instance_id = ec2_id_to_id(ec2_id)
+ instance_id = ec2utils.ec2_id_to_id(ec2_id)
return self.compute_api.get_vnc_console(context,
instance_id=instance_id)