summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-03-02 01:21:54 -0800
committerAnthony Young <sleepsonthefloor@gmail.com>2011-03-02 01:21:54 -0800
commit7825b7ce81dec97e997d296c3e30b5d143948abc (patch)
treed075eb1a08c4cad41df318a33f320e2799f76d71 /nova/api
parentbb7c1b8c63632c789ed0cd3785a22b7baa90fd83 (diff)
initial commit of vnc support
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 844ccbe5e..aa9c6824e 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -539,6 +539,12 @@ class CloudController(object):
return self.compute_api.get_ajax_console(context,
instance_id=instance_id)
+ def get_vnc_console(self, context, instance_id, **kwargs):
+ ec2_id = instance_id
+ instance_id = ec2_id_to_id(ec2_id)
+ return self.compute_api.get_vnc_console(context,
+ instance_id=instance_id)
+
def describe_volumes(self, context, volume_id=None, **kwargs):
if volume_id:
volumes = []