diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2011-12-16 12:01:59 -0800 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2011-12-16 12:13:26 -0800 |
| commit | 9b9b6d3076a13f762e0152b8399875e7fbad30db (patch) | |
| tree | 6f04c1f1d0719512f54057e9e2705bb8fe69d858 /nova | |
| parent | ee34849f091658dbb9adb73b7a31ad3ca85b4a01 (diff) | |
missing comments about extensions to ec2
Change-Id: I0b5a74aaf76cbc52e6d24217d22bd4bec2c98fbe
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index cdedac679..c6df3913f 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -813,13 +813,18 @@ class CloudController(object): "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) @@ -1346,6 +1351,7 @@ class CloudController(object): 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: |
