Skip to content

Commit

Permalink
missing comments about extensions to ec2
Browse files Browse the repository at this point in the history
Change-Id: I0b5a74aaf76cbc52e6d24217d22bd4bec2c98fbe
  • Loading branch information
anotherjesse committed Dec 16, 2011
1 parent ee34849 commit 9b9b6d3
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion nova/api/ec2/cloud.py
Expand Up @@ -813,13 +813,18 @@ def get_console_output(self, context, instance_id, **kwargs):
"output": base64.b64encode(output)}

def get_ajax_console(self, context, instance_id, **kwargs):
"""Web based ajax terminal for vm.
This is an extension to the normal ec2_api"""
ec2_id = instance_id[0]
instance_id = ec2utils.ec2_id_to_id(ec2_id)
instance = self.compute_api.get(context, instance_id)
return self.compute_api.get_ajax_console(context, instance)

def get_vnc_console(self, context, instance_id, **kwargs):
"""Returns vnc browser url. Used by OS dashboard."""
"""Returns vnc browser url.
This is an extension to the normal ec2_api"""
ec2_id = instance_id
instance_id = ec2utils.ec2_id_to_id(ec2_id)
instance = self.compute_api.get(context, instance_id)
Expand Down Expand Up @@ -1346,6 +1351,7 @@ def unrescue_instance(self, context, instance_id, **kwargs):
return True

def update_instance(self, context, instance_id, **kwargs):
"""This is an extension to the normal ec2_api"""
updatable_fields = ['display_name', 'display_description']
changes = {}
for field in updatable_fields:
Expand Down

0 comments on commit 9b9b6d3

Please sign in to comment.